http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js index 0bc5f60..e3c4b62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js @@ -34,8 +34,8 @@ 'nf.PolicyManagement', 'nf.ComponentState', 'nf.ng.Bridge'], - function ($, d3, Slick, client, shell, processGroupConfiguration, canvasUtils, errorHandler, dialog, common, controllerService, processGroup, policyManagement, componentState, angularBridge) { - return (nf.ControllerServices = factory($, d3, Slick, client, shell, processGroupConfiguration, canvasUtils, errorHandler, dialog, common, controllerService, processGroup, policyManagement, componentState, angularBridge)); + function ($, d3, Slick, nfClient, nfShell, nfProcessGroupConfiguration, nfCanvasUtils, nfErrorHandler, nfDialog, nfCommon, nfControllerService, nfProcessGroup, nfPolicyManagement, nfComponentState, nfNgBridge) { + return (nf.ControllerServices = factory($, d3, Slick, nfClient, nfShell, nfProcessGroupConfiguration, nfCanvasUtils, nfErrorHandler, nfDialog, nfCommon, nfControllerService, nfProcessGroup, nfPolicyManagement, nfComponentState, nfNgBridge)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.ControllerServices = @@ -71,7 +71,7 @@ root.nf.ComponentState, root.nf.ng.Bridge); } -}(this, function ($, d3, Slick, client, shell, processGroupConfiguration, canvasUtils, errorHandler, dialog, common, controllerService, processGroup, policyManagement, componentState, angularBridge) { +}(this, function ($, d3, Slick, nfClient, nfShell, nfProcessGroupConfiguration, nfCanvasUtils, nfErrorHandler, nfDialog, nfCommon, nfControllerService, nfProcessGroup, nfPolicyManagement, nfComponentState, nfNgBridge) { 'use strict'; var dblClick = null; @@ -100,7 +100,7 @@ * @param item controller service type */ var isSelectable = function (item) { - return common.isBlank(item.usageRestriction) || common.canAccessRestrictedComponents(); + return nfCommon.isBlank(item.usageRestriction) || nfCommon.canAccessRestrictedComponents(); }; /** @@ -120,7 +120,7 @@ var controllerServiceTypesGrid = $('#controller-service-types-table').data('gridInstance'); // ensure the grid has been initialized - if (common.isDefinedAndNotNull(controllerServiceTypesGrid)) { + if (nfCommon.isDefinedAndNotNull(controllerServiceTypesGrid)) { var controllerServiceTypesData = controllerServiceTypesGrid.getData(); // update the search criteria @@ -257,7 +257,7 @@ // ensure something was selected if (selectedServiceType === '') { - dialog.showOkDialog({ + nfDialog.showOkDialog({ headerText: 'Controller Service', dialogContent: 'The type of controller service to create must be selected.' }); @@ -276,7 +276,7 @@ var addControllerService = function (controllerServicesUri, serviceTable, controllerServiceType) { // build the controller service entity var controllerServiceEntity = { - 'revision': client.getRevision({ + 'revision': nfClient.getRevision({ 'revision': { 'version': 0 } @@ -307,7 +307,7 @@ var row = controllerServicesData.getRowById(controllerServiceEntity.id); controllerServicesGrid.setSelectedRows([row]); controllerServicesGrid.scrollRowIntoView(row); - }).fail(errorHandler.handleAjaxError); + }).fail(nfErrorHandler.handleAjaxError); // hide the dialog $('#new-controller-service-dialog').modal('hide'); @@ -325,7 +325,7 @@ id: 'type', name: 'Type', field: 'label', - formatter: common.typeFormatter, + formatter: nfCommon.typeFormatter, sortable: false, resizable: true }, @@ -359,11 +359,11 @@ var controllerServiceType = controllerServiceTypesGrid.getDataItem(controllerServiceTypeIndex); // set the controller service type description - if (common.isDefinedAndNotNull(controllerServiceType)) { + if (nfCommon.isDefinedAndNotNull(controllerServiceType)) { // show the selected controller service $('#controller-service-description-container').show(); - if (common.isBlank(controllerServiceType.description)) { + if (nfCommon.isBlank(controllerServiceType.description)) { $('#controller-service-type-description') .attr('title', '') .html('<span class="unset">No description specified</span>'); @@ -385,7 +385,7 @@ } }); controllerServiceTypesGrid.onViewportChanged.subscribe(function (e, args) { - common.cleanUpTooltips($('#controller-service-types-table'), 'div.view-usage-restriction'); + nfCommon.cleanUpTooltips($('#controller-service-types-table'), 'div.view-usage-restriction'); }); // wire up the dataview to the grid @@ -412,8 +412,8 @@ var item = controllerServiceTypesData.getItemById(rowId); // show the tooltip - if (common.isDefinedAndNotNull(item.usageRestriction)) { - usageRestriction.qtip($.extend({}, common.config.tooltipConfig, { + if (nfCommon.isDefinedAndNotNull(item.usageRestriction)) { + usageRestriction.qtip($.extend({}, nfCommon.config.tooltipConfig, { content: item.usageRestriction, position: { container: $('#summary'), @@ -446,10 +446,10 @@ // add the documented type controllerServiceTypesData.addItem({ id: id++, - label: common.substringAfterLast(documentedType.type, '.'), + label: nfCommon.substringAfterLast(documentedType.type, '.'), type: documentedType.type, - description: common.escapeHtml(documentedType.description), - usageRestriction: common.escapeHtml(documentedType.usageRestriction), + description: nfCommon.escapeHtml(documentedType.description), + usageRestriction: nfCommon.escapeHtml(documentedType.usageRestriction), tags: documentedType.tags.join(', ') }); @@ -471,7 +471,7 @@ select: applyControllerServiceTypeFilter, remove: applyControllerServiceTypeFilter }); - }).fail(errorHandler.handleAjaxError); + }).fail(nfErrorHandler.handleAjaxError); // initialize the controller service dialog $('#new-controller-service-dialog').modal({ @@ -539,7 +539,7 @@ return ''; } - return common.substringAfterLast(dataContext.component.type, '.'); + return nfCommon.substringAfterLast(dataContext.component.type, '.'); }; /** @@ -557,7 +557,7 @@ return ''; } - if (common.isDefinedAndNotNull(dataContext.component.parentGroupId)) { + if (nfCommon.isDefinedAndNotNull(dataContext.component.parentGroupId)) { return dataContext.component.parentGroupId; } else { return 'Controller'; @@ -574,7 +574,7 @@ // we know the process group for this controller service is part // of the current breadcrumb trail var canWriteProcessGroupParent = function (processGroupId) { - var breadcrumbs = angularBridge.injector.get('breadcrumbsCtrl').getBreadcrumbs(); + var breadcrumbs = nfNgBridge.injector.get('breadcrumbsCtrl').getBreadcrumbs(); var isAuthorized = false; $.each(breadcrumbs, function (_, breadcrumbEntity) { @@ -587,10 +587,10 @@ return isAuthorized; }; - if (common.isDefinedAndNotNull(dataContext.component.parentGroupId)) { + if (nfCommon.isDefinedAndNotNull(dataContext.component.parentGroupId)) { return canWriteProcessGroupParent(dataContext.component.parentGroupId); } else { - return common.canModifyController(); + return nfCommon.canModifyController(); } }; @@ -606,31 +606,31 @@ if(a.permissions.canRead && b.permissions.canRead) { if (sortDetails.columnId === 'moreDetails') { var aBulletins = 0; - if (!common.isEmpty(a.bulletins)) { + if (!nfCommon.isEmpty(a.bulletins)) { aBulletins = a.bulletins.length; } var bBulletins = 0; - if (!common.isEmpty(b.bulletins)) { + if (!nfCommon.isEmpty(b.bulletins)) { bBulletins = b.bulletins.length; } return aBulletins - bBulletins; } else if (sortDetails.columnId === 'type') { - var aType = common.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? common.substringAfterLast(a.component[sortDetails.columnId], '.') : ''; - var bType = common.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? common.substringAfterLast(b.component[sortDetails.columnId], '.') : ''; + var aType = nfCommon.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? nfCommon.substringAfterLast(a.component[sortDetails.columnId], '.') : ''; + var bType = nfCommon.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? nfCommon.substringAfterLast(b.component[sortDetails.columnId], '.') : ''; return aType === bType ? 0 : aType > bType ? 1 : -1; } else if (sortDetails.columnId === 'state') { var aState = 'Invalid'; - if (common.isEmpty(a.component.validationErrors)) { - aState = common.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : ''; + if (nfCommon.isEmpty(a.component.validationErrors)) { + aState = nfCommon.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : ''; } var bState = 'Invalid'; - if (common.isEmpty(b.component.validationErrors)) { - bState = common.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : ''; + if (nfCommon.isEmpty(b.component.validationErrors)) { + bState = nfCommon.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : ''; } return aState === bState ? 0 : aState > bState ? 1 : -1; } else { - var aString = common.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : ''; - var bString = common.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : ''; + var aString = nfCommon.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : ''; + var bString = nfCommon.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : ''; return aString === bString ? 0 : aString > bString ? 1 : -1; } } else { @@ -667,8 +667,8 @@ // always include a button to view the usage markup += '<div title="Usage" class="pointer controller-service-usage fa fa-book" style="margin-top: 5px; margin-right: 3px;" ></div>'; - var hasErrors = !common.isEmpty(dataContext.component.validationErrors); - var hasBulletins = !common.isEmpty(dataContext.bulletins); + var hasErrors = !nfCommon.isEmpty(dataContext.component.validationErrors); + var hasBulletins = !nfCommon.isEmpty(dataContext.bulletins); if (hasErrors) { markup += '<div class="pointer has-errors fa fa-warning" style="margin-top: 4px; margin-right: 3px; float: left;" ></div>'; @@ -679,7 +679,7 @@ } if (hasErrors || hasBulletins) { - markup += '<span class="hidden row-id">' + common.escapeHtml(dataContext.id) + '</span>'; + markup += '<span class="hidden row-id">' + nfCommon.escapeHtml(dataContext.id) + '</span>'; } return markup; @@ -692,7 +692,7 @@ // determine the appropriate label var icon = '', label = ''; - if (!common.isEmpty(dataContext.component.validationErrors)) { + if (!nfCommon.isEmpty(dataContext.component.validationErrors)) { icon = 'invalid fa fa-warning'; label = 'Invalid'; } else { @@ -726,7 +726,7 @@ markup += '<div class="pointer edit-controller-service fa fa-pencil" title="Edit" style="margin-top: 2px; margin-right: 3px;" ></div>'; // if there are no validation errors allow enabling - if (common.isEmpty(dataContext.component.validationErrors)) { + if (nfCommon.isEmpty(dataContext.component.validationErrors)) { markup += '<div class="pointer enable-controller-service fa fa-flash" title="Enable" style="margin-top: 2px; margin-right: 3px;"></div>'; } } @@ -741,7 +741,7 @@ } // allow policy configuration conditionally - if (canvasUtils.isConfigurableAuthorizer() && common.canAccessTenants()) { + if (nfCanvasUtils.isConfigurableAuthorizer() && nfCommon.canAccessTenants()) { markup += '<div title="Access Policies" class="pointer edit-access-policies fa fa-key" style="margin-top: 2px;"></div>'; } @@ -827,44 +827,44 @@ // determine the desired action if (controllerServicesGrid.getColumns()[args.cell].id === 'actions') { if (target.hasClass('edit-controller-service')) { - controllerService.showConfiguration(serviceTable, controllerServiceEntity); + nfControllerService.showConfiguration(serviceTable, controllerServiceEntity); } else if (target.hasClass('enable-controller-service')) { - controllerService.enable(serviceTable, controllerServiceEntity); + nfControllerService.enable(serviceTable, controllerServiceEntity); } else if (target.hasClass('disable-controller-service')) { - controllerService.disable(serviceTable, controllerServiceEntity); + nfControllerService.disable(serviceTable, controllerServiceEntity); } else if (target.hasClass('delete-controller-service')) { - controllerService.promptToDeleteController(serviceTable, controllerServiceEntity); + nfControllerService.promptToDeleteController(serviceTable, controllerServiceEntity); } else if (target.hasClass('view-state-controller-service')) { - componentState.showState(controllerServiceEntity, controllerServiceEntity.state === 'DISABLED'); + nfComponentState.showState(controllerServiceEntity, controllerServiceEntity.state === 'DISABLED'); } else if (target.hasClass('edit-access-policies')) { // show the policies for this service - policyManagement.showControllerServicePolicy(controllerServiceEntity); + nfPolicyManagement.showControllerServicePolicy(controllerServiceEntity); // close the settings dialog $('#shell-close-button').click(); } } else if (controllerServicesGrid.getColumns()[args.cell].id === 'moreDetails') { if (target.hasClass('view-controller-service')) { - controllerService.showDetails(serviceTable, controllerServiceEntity); + nfControllerService.showDetails(serviceTable, controllerServiceEntity); } else if (target.hasClass('controller-service-usage')) { // close the settings dialog $('#shell-close-button').click(); // open the documentation for this controller service - shell.showPage('../nifi-docs/documentation?' + $.param({ - select: common.substringAfterLast(controllerServiceEntity.component.type, '.') + nfShell.showPage('../nifi-docs/documentation?' + $.param({ + select: nfCommon.substringAfterLast(controllerServiceEntity.component.type, '.') })).done(function() { - if (common.isDefinedAndNotNull(controllerServiceEntity.component.parentGroupId)) { + if (nfCommon.isDefinedAndNotNull(controllerServiceEntity.component.parentGroupId)) { var groupId; - var processGroup = processGroup.get(controllerServiceEntity.component.parentGroupId); - if (common.isDefinedAndNotNull(processGroup)) { + var processGroup = nfProcessGroup.get(controllerServiceEntity.component.parentGroupId); + if (nfCommon.isDefinedAndNotNull(processGroup)) { groupId = processGroup.id; } else { - groupId = canvasUtils.getGroupId(); + groupId = nfCanvasUtils.getGroupId(); } // reload the corresponding group - processGroupConfiguration.showConfiguration(groupId); + nfProcessGroupConfiguration.showConfiguration(groupId); } else { showSettings(); } @@ -894,12 +894,12 @@ var controllerServiceEntity = controllerServicesData.getItemById(serviceId); // format the errors - var tooltip = common.formatUnorderedList(controllerServiceEntity.component.validationErrors); + var tooltip = nfCommon.formatUnorderedList(controllerServiceEntity.component.validationErrors); // show the tooltip - if (common.isDefinedAndNotNull(tooltip)) { + if (nfCommon.isDefinedAndNotNull(tooltip)) { errorIcon.qtip($.extend({}, - common.config.tooltipConfig, + nfCommon.config.tooltipConfig, { content: tooltip, position: { @@ -923,13 +923,13 @@ var controllerServiceEntity = controllerServicesData.getItemById(taskId); // format the tooltip - var bulletins = common.getFormattedBulletins(controllerServiceEntity.bulletins); - var tooltip = common.formatUnorderedList(bulletins); + var bulletins = nfCommon.getFormattedBulletins(controllerServiceEntity.bulletins); + var tooltip = nfCommon.formatUnorderedList(bulletins); // show the tooltip - if (common.isDefinedAndNotNull(tooltip)) { + if (nfCommon.isDefinedAndNotNull(tooltip)) { bulletinIcon.qtip($.extend({}, - common.config.tooltipConfig, + nfCommon.config.tooltipConfig, { content: tooltip, position: { @@ -966,8 +966,8 @@ }, service)); }); - common.cleanUpTooltips(serviceTable, 'div.has-errors'); - common.cleanUpTooltips(serviceTable, 'div.has-bulletins'); + nfCommon.cleanUpTooltips(serviceTable, 'div.has-errors'); + nfCommon.cleanUpTooltips(serviceTable, 'div.has-bulletins'); var controllerServicesGrid = serviceTable.data('gridInstance'); var controllerServicesData = controllerServicesGrid.getData(); @@ -1084,7 +1084,7 @@ controllerServiceTypesGrid.onDblClick.subscribe(dblClick); // reset the canvas size after the dialog is shown - if (common.isDefinedAndNotNull(controllerServiceTypesGrid)) { + if (nfCommon.isDefinedAndNotNull(controllerServiceTypesGrid)) { controllerServiceTypesGrid.setSelectedRows([0]); controllerServiceTypesGrid.resizeCanvas(); } @@ -1100,7 +1100,7 @@ */ resetTableSize: function (serviceTable) { var controllerServicesGrid = serviceTable.data('gridInstance'); - if (common.isDefinedAndNotNull(controllerServicesGrid)) { + if (nfCommon.isDefinedAndNotNull(controllerServicesGrid)) { controllerServicesGrid.resizeCanvas(); } }, @@ -1128,14 +1128,14 @@ controllerServicesData.beginUpdate(); // if there are some bulletins process them - if (!common.isEmpty(controllerServiceBulletins)) { + if (!nfCommon.isEmpty(controllerServiceBulletins)) { var controllerServiceBulletinsBySource = d3.nest() .key(function(d) { return d.sourceId; }) .map(controllerServiceBulletins, d3.map); controllerServiceBulletinsBySource.forEach(function(sourceId, sourceBulletins) { var controllerService = controllerServicesData.getItemById(sourceId); - if (common.isDefinedAndNotNull(controllerService)) { + if (nfCommon.isDefinedAndNotNull(controllerService)) { controllerServicesData.updateItem(sourceId, $.extend(controllerService, { bulletins: sourceBulletins }));
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-ui.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-ui.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-ui.js index fc4cbba..f54268a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-ui.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-ui.js @@ -23,8 +23,8 @@ 'nf.Common', 'nf.Shell', 'nf.Dialog', - 'nf.Client'], function ($, common, shell, dialog, client) { - return (nf.CustomUi = factory($, common, shell, dialog, client)); + 'nf.Client'], function ($, nfCommon, nfShell, nfDialog, nfClient) { + return (nf.CustomUi = factory($, nfCommon, nfShell, nfDialog, nfClient)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.CustomUi = factory(require('jquery'), @@ -39,7 +39,7 @@ root.nf.Dialog, root.nf.Client); } -}(this, function ($, common, shell, dialog, client) { +}(this, function ($, nfCommon, nfShell, nfDialog, nfClient) { 'use strict'; return { @@ -52,11 +52,11 @@ */ showCustomUi: function (entity, uri, editable) { return $.Deferred(function (deferred) { - common.getAccessToken('../nifi-api/access/ui-extension-token').done(function (uiExtensionToken) { + nfCommon.getAccessToken('../nifi-api/access/ui-extension-token').done(function (uiExtensionToken) { // record the processor id $('#shell-close-button'); - var revision = client.getRevision(entity); + var revision = nfClient.getRevision(entity); // build the customer ui params var customUiParams = { @@ -67,16 +67,16 @@ }; // conditionally include the ui extension token - if (!common.isBlank(uiExtensionToken)) { + if (!nfCommon.isBlank(uiExtensionToken)) { customUiParams['access_token'] = uiExtensionToken; } // show the shell - shell.showPage('..' + uri + '?' + $.param(customUiParams), false).done(function () { + nfShell.showPage('..' + uri + '?' + $.param(customUiParams), false).done(function () { deferred.resolve(); }); }).fail(function () { - dialog.showOkDialog({ + nfDialog.showOkDialog({ headerText: 'Advanced Configuration', dialogContent: 'Unable to generate access token for accessing the advanced configuration dialog.' }); http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js index f4adb92..b9a6ab9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js @@ -28,8 +28,8 @@ 'nf.Dialog', 'nf.Client', 'nf.ErrorHandler'], - function ($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler) { - return (nf.Draggable = factory($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler)); + function ($, d3, nfConnection, nfBirdseye, nfCanvasUtils, nfCommon, nfDialog, nfClient, nfErrorHandler) { + return (nf.Draggable = factory($, d3, nfConnection, nfBirdseye, nfCanvasUtils, nfCommon, nfDialog, nfClient, nfErrorHandler)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.Draggable = @@ -53,7 +53,7 @@ root.nf.Client, root.nf.ErrorHandler); } -}(this, function ($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler) { +}(this, function ($, d3, nfConnection, nfBirdseye, nfCanvasUtils, nfCommon, nfDialog, nfClient, nfErrorHandler) { 'use strict'; var nfCanvas; @@ -83,8 +83,8 @@ var selectedComponents = d3.selectAll('g.component.selected'); // ensure every component is writable - if (canvasUtils.canModify(selectedConnections) === false || canvasUtils.canModify(selectedComponents) === false) { - dialog.showOkDialog({ + if (nfCanvasUtils.canModify(selectedConnections) === false || nfCanvasUtils.canModify(selectedComponents) === false) { + nfDialog.showOkDialog({ headerText: 'Component Position', dialogContent: 'Must be authorized to modify every component selected.' }); @@ -104,7 +104,7 @@ // consider any self looping connections var connections = nfConnection.getComponentConnections(d.id); $.each(connections, function (_, connection) { - if (!updates.has(connection.id) && canvasUtils.getConnectionSourceComponentId(connection) === canvasUtils.getConnectionDestinationComponentId(connection)) { + if (!updates.has(connection.id) && nfCanvasUtils.getConnectionSourceComponentId(connection) === nfCanvasUtils.getConnectionDestinationComponentId(connection)) { var connectionUpdate = nfDraggable.updateConnectionPosition(nfConnection.get(connection.id), delta); if (connectionUpdate !== null) { updates.set(connection.id, connectionUpdate); @@ -126,15 +126,15 @@ var selection = d3.selectAll('g.component.selected, g.connection.selected'); var group = d3.select('g.drop'); - if (canvasUtils.canModify(selection) === false) { - dialog.showOkDialog({ + if (nfCanvasUtils.canModify(selection) === false) { + nfDialog.showOkDialog({ headerText: 'Component Position', dialogContent: 'Must be authorized to modify every component selected.' }); return; } - if (canvasUtils.canModify(group) === false) { - dialog.showOkDialog({ + if (nfCanvasUtils.canModify(group) === false) { + nfDialog.showOkDialog({ headerText: 'Component Position', dialogContent: 'Not authorized to modify the destination group.' }); @@ -142,7 +142,7 @@ } // move the seleciton into the group - canvasUtils.moveComponents(selection, group); + nfCanvasUtils.moveComponents(selection, group); }; var nfDraggable = { @@ -193,10 +193,10 @@ .attr('width', maxX - minX) .attr('height', maxY - minY) .attr('stroke-width', function () { - return 1 / canvasUtils.scaleCanvasView(); + return 1 / nfCanvasUtils.scaleCanvasView(); }) .attr('stroke-dasharray', function () { - return 4 / canvasUtils.scaleCanvasView(); + return 4 / nfCanvasUtils.scaleCanvasView(); }) .datum({ original: { @@ -257,7 +257,7 @@ // build the entity var entity = { - 'revision': client.getRevision(d), + 'revision': nfClient.getRevision(d), 'component': { 'id': d.id, 'position': newPosition @@ -274,7 +274,7 @@ contentType: 'application/json' }).done(function (response) { // update the component - canvasUtils.getComponentByType(d.type).set(response); + nfCanvasUtils.getComponentByType(d.type).set(response); // resolve with an object so we can refresh when finished deferred.resolve({ @@ -283,12 +283,12 @@ }); }).fail(function (xhr, status, error) { if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) { - dialog.showOkDialog({ + nfDialog.showOkDialog({ headerText: 'Component Position', - dialogContent: common.escapeHtml(xhr.responseText) + dialogContent: nfCommon.escapeHtml(xhr.responseText) }); } else { - errorHandler.handleAjaxError(xhr, status, error); + nfErrorHandler.handleAjaxError(xhr, status, error); } deferred.reject(); @@ -318,7 +318,7 @@ }); var entity = { - 'revision': client.getRevision(d), + 'revision': nfClient.getRevision(d), 'component': { id: d.id, bends: newBends @@ -344,12 +344,12 @@ }); }).fail(function (xhr, status, error) { if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) { - dialog.showOkDialog({ + nfDialog.showOkDialog({ headerText: 'Component Position', - dialogContent: common.escapeHtml(xhr.responseText) + dialogContent: nfCommon.escapeHtml(xhr.responseText) }); } else { - errorHandler.handleAjaxError(xhr, status, error); + nfErrorHandler.handleAjaxError(xhr, status, error); } deferred.reject(); @@ -388,7 +388,7 @@ nfConnection.refresh(connectionId); }); }).always(function () { - birdseye.refresh(); + nfBirdseye.refresh(); }); } }, http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js index 0488314..44ff136 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js @@ -24,8 +24,8 @@ 'nf.Common', 'nf.Client', 'nf.CanvasUtils'], - function ($, d3, common, client, canvasUtils) { - return (nf.Funnel = factory($, d3, common, client, canvasUtils)); + function ($, d3, nfCommon, nfClient, nfCanvasUtils) { + return (nf.Funnel = factory($, d3, nfCommon, nfClient, nfCanvasUtils)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.Funnel = @@ -41,7 +41,7 @@ root.nf.Client, root.nf.CanvasUtils); } -}(this, function ($, d3, common, client, canvasUtils) { +}(this, function ($, d3, nfCommon, nfClient, nfCanvasUtils) { 'use strict'; var nfConnectable; @@ -105,7 +105,7 @@ 'class': 'funnel component' }) .classed('selected', selected) - .call(canvasUtils.position); + .call(nfCanvasUtils.position); // funnel border funnel.append('rect') @@ -178,7 +178,7 @@ var funnel = d3.select(this); // update the component behavior as appropriate - canvasUtils.editable(funnel, nfConnectable, nfDraggable); + nfCanvasUtils.editable(funnel, nfConnectable, nfDraggable); }); }; @@ -194,12 +194,17 @@ var nfFunnel = { /** * Initializes of the Processor handler. + * + * @param nfConnectableRef The nfConnectable module. + * @param nfDraggableRef The nfDraggable module. + * @param nfSelectableRef The nfSelectable module. + * @param nfContextMenuRef The nfContextMenu module. */ - init: function (connectable, draggable, selectable, contextMenu) { - nfConnectable = connectable; - nfDraggable = draggable; - nfSelectable = selectable; - nfContextMenu = contextMenu; + init: function (nfConnectableRef, nfDraggableRef, nfSelectableRef, nfContextMenuRef) { + nfConnectable = nfConnectableRef; + nfDraggable = nfDraggableRef; + nfSelectable = nfSelectableRef; + nfContextMenu = nfContextMenuRef; funnelMap = d3.map(); removedCache = d3.map(); @@ -221,8 +226,8 @@ */ add: function (funnelEntities, options) { var selectAll = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; } // get the current time @@ -243,7 +248,7 @@ $.each(funnelEntities, function (_, funnelEntity) { add(funnelEntity); }); - } else if (common.isDefinedAndNotNull(funnelEntities)) { + } else if (nfCommon.isDefinedAndNotNull(funnelEntities)) { add(funnelEntities); } @@ -262,16 +267,16 @@ set: function (funnelEntities, options) { var selectAll = false; var transition = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; - transition = common.isDefinedAndNotNull(options.transition) ? options.transition : transition; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + transition = nfCommon.isDefinedAndNotNull(options.transition) ? options.transition : transition; } var set = function (proposedFunnelEntity) { var currentFunnelEntity = funnelMap.get(proposedFunnelEntity.id); // set the funnel if appropriate due to revision and wasn't previously removed - if (client.isNewerRevision(currentFunnelEntity, proposedFunnelEntity) && !removedCache.has(proposedFunnelEntity.id)) { + if (nfClient.isNewerRevision(currentFunnelEntity, proposedFunnelEntity) && !removedCache.has(proposedFunnelEntity.id)) { funnelMap.set(proposedFunnelEntity.id, $.extend({ type: 'Funnel', dimensions: dimensions @@ -294,14 +299,14 @@ $.each(funnelEntities, function (_, funnelEntity) { set(funnelEntity); }); - } else if (common.isDefinedAndNotNull(funnelEntities)) { + } else if (nfCommon.isDefinedAndNotNull(funnelEntities)) { set(funnelEntities); } // apply the selection and handle all new processors var selection = select(); selection.enter().call(renderFunnels, selectAll); - selection.call(updateFunnels).call(canvasUtils.position, transition); + selection.call(updateFunnels).call(nfCanvasUtils.position, transition); selection.exit().call(removeFunnels); }, @@ -312,7 +317,7 @@ * @param {string} id */ get: function (id) { - if (common.isUndefined(id)) { + if (nfCommon.isUndefined(id)) { return funnelMap.values(); } else { return funnelMap.get(id); @@ -326,7 +331,7 @@ * @param {string} id Optional */ refresh: function (id) { - if (common.isDefinedAndNotNull(id)) { + if (nfCommon.isDefinedAndNotNull(id)) { d3.select('#id-' + id).call(updateFunnels); } else { d3.selectAll('g.funnel').call(updateFunnels); @@ -358,7 +363,7 @@ * @param {string} id The id */ position: function (id) { - d3.select('#id-' + id).call(canvasUtils.position); + d3.select('#id-' + id).call(nfCanvasUtils.position); }, /** http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js index b69f143..8faf92d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js @@ -25,8 +25,8 @@ define(['jquery', 'nf.ErrorHandler', 'nf.CanvasUtils'], - function ($, errorHandler, canvasUtils) { - return (nf.GoTo = factory($, errorHandler, canvasUtils)); + function ($, nfErrorHandler, nfCanvasUtils) { + return (nf.GoTo = factory($, nfErrorHandler, nfCanvasUtils)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.GoTo = @@ -38,7 +38,7 @@ root.nf.ErrorHandler, root.nf.CanvasUtils); } -}(this, function ($, errorHandler, canvasUtils) { +}(this, function ($, nfErrorHandler, nfCanvasUtils) { 'use strict'; var config = { @@ -76,7 +76,7 @@ var connectionStyle = 'unset'; var connectionName = 'Connection'; if (connectionEntity.permissions.canRead === true) { - var formattedConnectionName = canvasUtils.formatConnectionName(connectionEntity.component); + var formattedConnectionName = nfCanvasUtils.formatConnectionName(connectionEntity.component); if (formattedConnectionName !== '') { connectionStyle = ''; connectionName = formattedConnectionName; @@ -87,7 +87,7 @@ $('<div class="search-result-icon icon-connect"></div>').appendTo(connectionEntry); $('<div class="connection-entry-name go-to-link"></div>').attr('title', connectionName).addClass(connectionStyle).text(connectionName).on('click', function () { // go to the connection - canvasUtils.showComponent(parentProcessGroupId, connectionEntity.id); + nfCanvasUtils.showComponent(parentProcessGroupId, connectionEntity.id); // close the dialog $('#connections-dialog').modal('hide'); @@ -136,7 +136,7 @@ $('<div class="search-result-icon"></div>').addClass(smallIconClass).appendTo(downstreamComponent); $('<div class="destination-component-name go-to-link"></div>').attr('title', destinationName).text(destinationName).on('click', function () { // go to the component - canvasUtils.showComponent(connectionEntity.destinationGroupId, connectionEntity.destinationId); + nfCanvasUtils.showComponent(connectionEntity.destinationGroupId, connectionEntity.destinationId); // close the dialog $('#connections-dialog').modal('hide'); @@ -171,7 +171,7 @@ $('<div class="search-result-icon icon-group"></div>').appendTo(downstreamComponent); $('<div class="destination-component-name go-to-link"></div>').attr('title', groupLabel).text(groupLabel).on('click', function () { // go to the remote process group - canvasUtils.showComponent(parentProcessGroupId, processGroupEntity.id); + nfCanvasUtils.showComponent(parentProcessGroupId, processGroupEntity.id); // close the dialog $('#connections-dialog').modal('hide'); @@ -193,7 +193,7 @@ $('<div class="search-result-icon icon-port-in"></div>').appendTo(downstreamInputPort); $('<div class="destination-input-port-name go-to-link"></div>').attr('title', portLabel).text(portLabel).on('click', function () { // go to the remote process group - canvasUtils.showComponent(connectionEntity.destinationGroupId, connectionEntity.destinationId); + nfCanvasUtils.showComponent(connectionEntity.destinationGroupId, connectionEntity.destinationId); // close the dialog $('#connections-dialog').modal('hide'); @@ -228,7 +228,7 @@ $('<div class="search-result-icon icon-group-remote"></div>').appendTo(downstreamComponent); $('<div class="destination-component-name go-to-link"></div>').attr('title', remoteGroupLabel).text(remoteGroupLabel).on('click', function () { // go to the remote process group - canvasUtils.showComponent(parentProcessGroupId, remoteProcessGroupEntity.id); + nfCanvasUtils.showComponent(parentProcessGroupId, remoteProcessGroupEntity.id); // close the dialog $('#connections-dialog').modal('hide'); @@ -282,7 +282,7 @@ $('<div class="search-result-icon"></div>').addClass(smallIconClass).appendTo(sourceComponent); $('<div class="source-component-name go-to-link"></div>').attr('title', sourceName).text(sourceName).on('click', function () { // go to the component - canvasUtils.showComponent(connectionEntity.sourceGroupId, connectionEntity.sourceId); + nfCanvasUtils.showComponent(connectionEntity.sourceGroupId, connectionEntity.sourceId); // close the dialog $('#connections-dialog').modal('hide'); @@ -317,7 +317,7 @@ $('<div class="search-result-icon icon-group"></div>').appendTo(sourceComponent); $('<div class="source-component-name go-to-link"></div>').attr('title', groupLabel).text(groupLabel).on('click', function () { // go to the process group - canvasUtils.showComponent(parentProcessGroupId, processGroupEntity.id); + nfCanvasUtils.showComponent(parentProcessGroupId, processGroupEntity.id); // close the dialog $('#connections-dialog').modal('hide'); @@ -338,7 +338,7 @@ $('<div class="search-result-icon icon-port-out"></div>').appendTo(sourceOutputPort); $('<div class="source-output-port-name go-to-link"></div>').attr('title', portLabel).text(portLabel).on('click', function () { // go to the output port - canvasUtils.showComponent(connectionEntity.sourceGroupId, connectionEntity.sourceId); + nfCanvasUtils.showComponent(connectionEntity.sourceGroupId, connectionEntity.sourceId); // close the dialog $('#connections-dialog').modal('hide'); @@ -373,7 +373,7 @@ $('<div class="search-result-icon icon-group-remote"></div>').appendTo(sourceComponent); $('<div class="source-component-name go-to-link"></div>').attr('title', remoteGroupLabel).text(remoteGroupLabel).on('click', function () { // go to the remote process group - canvasUtils.showComponent(parentProcessGroupId, remoteProcessGroupEntity.id); + nfCanvasUtils.showComponent(parentProcessGroupId, remoteProcessGroupEntity.id); // close the dialog $('#connections-dialog').modal('hide'); @@ -451,9 +451,9 @@ */ showDownstreamFromProcessor: function (selection) { var processorEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var processorLabel = getDisplayName(processorEntity); @@ -471,7 +471,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the source if (connectionEntity.sourceId === processorEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -491,9 +491,9 @@ */ showUpstreamFromProcessor: function (selection) { var processorEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var processorLabel = getDisplayName(processorEntity); @@ -511,7 +511,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the destination if (connectionEntity.destinationId === processorEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -531,12 +531,12 @@ */ showDownstreamFromGroup: function (selection) { var groupEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var iconStyle = 'icon-group'; - if (canvasUtils.isRemoteProcessGroup(selection)) { + if (nfCanvasUtils.isRemoteProcessGroup(selection)) { iconStyle = 'icon-group-remote'; } @@ -556,7 +556,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the source if (connectionEntity.sourceGroupId === groupEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -576,12 +576,12 @@ */ showUpstreamFromGroup: function (selection) { var groupEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var iconStyle = 'icon-group'; - if (canvasUtils.isRemoteProcessGroup(selection)) { + if (nfCanvasUtils.isRemoteProcessGroup(selection)) { iconStyle = 'icon-group-remote'; } @@ -601,7 +601,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the destination if (connectionEntity.destinationGroupId === groupEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -621,9 +621,9 @@ */ showDownstreamFromInputPort: function (selection) { var portEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var portLabel = getDisplayName(portEntity); @@ -641,7 +641,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the source if (connectionEntity.sourceId === portEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -664,7 +664,7 @@ $.ajax({ type: 'GET', - url: config.urls.processGroups + encodeURIComponent(canvasUtils.getParentGroupId()), + url: config.urls.processGroups + encodeURIComponent(nfCanvasUtils.getParentGroupId()), dataType: 'json' }).done(function (response) { var flow = response.processGroupFlow.flow; @@ -681,7 +681,7 @@ // populate the upstream dialog $('#connections-context') .append('<div class="search-result-icon icon-group"></div>') - .append($('<div class="connections-component-name"></div>').text(canvasUtils.getGroupName())) + .append($('<div class="connections-component-name"></div>').text(nfCanvasUtils.getGroupName())) .append('<div class="clear"></div>') .append('<div class="search-result-icon icon-port-in" style="margin-left: 20px;"></div>') .append($('<div class="connections-component-name"></div>').text(portLabel)) @@ -691,7 +691,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the destination if (connectionEntity.destinationId === portEntity.id) { - addConnection(canvasUtils.getParentGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getParentGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -702,7 +702,7 @@ // show the upstream dialog $('#connections-dialog').modal('setHeaderText', 'Upstream Connections').modal('show'); - }).fail(errorHandler.handleAjaxError); + }).fail(nfErrorHandler.handleAjaxError); }, /** @@ -715,7 +715,7 @@ $.ajax({ type: 'GET', - url: config.urls.processGroups + encodeURIComponent(canvasUtils.getParentGroupId()), + url: config.urls.processGroups + encodeURIComponent(nfCanvasUtils.getParentGroupId()), dataType: 'json' }).done(function (response) { var flow = response.processGroupFlow.flow; @@ -732,7 +732,7 @@ // populate the downstream dialog $('#connections-context') .append('<div class="search-result-icon icon-group"></div>') - .append($('<div class="connections-component-name"></div>').text(canvasUtils.getGroupName())) + .append($('<div class="connections-component-name"></div>').text(nfCanvasUtils.getGroupName())) .append('<div class="clear"></div>') .append('<div class="search-result-icon icon-port-out" style="margin-left: 20px;"></div>') .append($('<div class="connections-component-name"></div>').text(portLabel)) @@ -742,7 +742,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the source if (connectionEntity.sourceId === portEntity.id) { - addConnection(canvasUtils.getParentGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getParentGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -753,7 +753,7 @@ // show the downstream dialog $('#connections-dialog').modal('setHeaderText', 'Downstream Connections').modal('show'); - }).fail(errorHandler.handleAjaxError); + }).fail(nfErrorHandler.handleAjaxError); }, /** @@ -763,9 +763,9 @@ */ showUpstreamFromOutputPort: function (selection) { var portEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); var portLabel = getDisplayName(portEntity); @@ -783,7 +783,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the destination if (connectionEntity.destinationId === portEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -803,9 +803,9 @@ */ showDownstreamFromFunnel: function (selection) { var funnelEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); // record details of the current component currentComponentId = funnelEntity.id; @@ -821,7 +821,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the source if (connectionEntity.sourceId === funnelEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); @@ -841,9 +841,9 @@ */ showUpstreamFromFunnel: function (selection) { var funnelEntity = selection.datum(); - var connections = canvasUtils.getComponentByType('Connection').get(); - var processGroups = canvasUtils.getComponentByType('ProcessGroup').get(); - var remoteProcessGroups = canvasUtils.getComponentByType('RemoteProcessGroup').get(); + var connections = nfCanvasUtils.getComponentByType('Connection').get(); + var processGroups = nfCanvasUtils.getComponentByType('ProcessGroup').get(); + var remoteProcessGroups = nfCanvasUtils.getComponentByType('RemoteProcessGroup').get(); // record details of the current component currentComponentId = funnelEntity.id; @@ -859,7 +859,7 @@ $.each(connections, function (_, connectionEntity) { // only show connections for which this selection is the destination if (connectionEntity.destinationId === funnelEntity.id) { - addConnection(canvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); + addConnection(nfCanvasUtils.getGroupId(), connectionEntity, processGroups, remoteProcessGroups); } }); http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js index bf21846..e5c8e22 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js @@ -35,8 +35,8 @@ 'nf.Draggable', 'nf.Selectable', 'nf.ContextMenu'], - function ($, d3, common, angularBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, canvasUtils, connectable, draggable, selectable, contextMenu) { - return (nf.Graph = factory($, d3, common, angularBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, canvasUtils, connectable, draggable, selectable, contextMenu)); + function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable, nfContextMenu) { + return (nf.Graph = factory($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable, nfContextMenu)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.Graph = @@ -74,15 +74,15 @@ root.nf.Selectable, root.nf.ContextMenu); } -}(this, function ($, d3, common, angularBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, canvasUtils, connectable, draggable, selectable, contextMenu) { +}(this, function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable, nfContextMenu) { 'use strict'; var combinePorts = function (contents) { - if (common.isDefinedAndNotNull(contents.inputPorts) && common.isDefinedAndNotNull(contents.outputPorts)) { + if (nfCommon.isDefinedAndNotNull(contents.inputPorts) && nfCommon.isDefinedAndNotNull(contents.outputPorts)) { return contents.inputPorts.concat(contents.outputPorts); - } else if (common.isDefinedAndNotNull(contents.inputPorts)) { + } else if (nfCommon.isDefinedAndNotNull(contents.inputPorts)) { return contents.inputPorts; - } else if (common.isDefinedAndNotNull(contents.outputPorts)) { + } else if (nfCommon.isDefinedAndNotNull(contents.outputPorts)) { return contents.outputPorts; } else { return []; @@ -90,11 +90,11 @@ }; var combinePortStatus = function (status) { - if (common.isDefinedAndNotNull(status.inputPortStatusSnapshots) && common.isDefinedAndNotNull(status.outputPortStatusSnapshots)) { + if (nfCommon.isDefinedAndNotNull(status.inputPortStatusSnapshots) && nfCommon.isDefinedAndNotNull(status.outputPortStatusSnapshots)) { return status.inputPortStatusSnapshots.concat(status.outputPortStatusSnapshots); - } else if (common.isDefinedAndNotNull(status.inputPortStatusSnapshots)) { + } else if (nfCommon.isDefinedAndNotNull(status.inputPortStatusSnapshots)) { return status.inputPortStatusSnapshots; - } else if (common.isDefinedAndNotNull(status.outputPortStatusSnapshots)) { + } else if (nfCommon.isDefinedAndNotNull(status.outputPortStatusSnapshots)) { return status.outputPortStatusSnapshots; } else { return []; @@ -106,8 +106,8 @@ */ var updateComponentVisibility = function () { var canvasContainer = $('#canvas-container'); - var translate = canvasUtils.translateCanvasView(); - var scale = canvasUtils.scaleCanvasView(); + var translate = nfCanvasUtils.translateCanvasView(); + var scale = nfCanvasUtils.scaleCanvasView(); // scale the translation translate = [translate[0] / scale, translate[1] / scale]; @@ -124,7 +124,7 @@ // detects whether a component is visible and should be rendered var isComponentVisible = function (d) { - if (!canvasUtils.shouldRenderPerScale()) { + if (!nfCanvasUtils.shouldRenderPerScale()) { return false; } @@ -139,7 +139,7 @@ // detects whether a connection is visible and should be rendered var isConnectionVisible = function (d) { - if (!canvasUtils.shouldRenderPerScale()) { + if (!nfCanvasUtils.shouldRenderPerScale()) { return false; } @@ -195,16 +195,16 @@ var nfGraph = { init: function () { // initialize the object responsible for each type of component - nfLabel.init(connectable, draggable, selectable, contextMenu); - nfFunnel.init(connectable, draggable, selectable, contextMenu); - nfPort.init(connectable, draggable, selectable, contextMenu); - nfRemoteProcessGroup.init(connectable, draggable, selectable, contextMenu); - nfProcessGroup.init(connectable, draggable, selectable, contextMenu); - nfProcessor.init(connectable, draggable, selectable, contextMenu); - nfConnection.init(selectable, contextMenu); + nfLabel.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfFunnel.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfPort.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfRemoteProcessGroup.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfProcessGroup.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfProcessor.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu); + nfConnection.init(nfSelectable, nfContextMenu); // load the graph - return nfProcessGroup.enterGroup(canvasUtils.getGroupId()); + return nfProcessGroup.enterGroup(nfCanvasUtils.getGroupId()); }, /** @@ -215,13 +215,13 @@ */ add: function (processGroupContents, options) { var selectAll = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; } // if we are going to select the new components, deselect the previous selection if (selectAll) { - canvasUtils.getSelection().classed('selected', false); + nfCanvasUtils.getSelection().classed('selected', false); } // merge the ports together @@ -238,7 +238,7 @@ // inform Angular app if the selection is changing if (selectAll) { - angularBridge.digest(); + nfNgBridge.digest(); } }, @@ -250,13 +250,13 @@ */ set: function (processGroupContents, options) { var selectAll = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; } // if we are going to select the new components, deselect the previous selection if (selectAll) { - canvasUtils.getSelection().classed('selected', false); + nfCanvasUtils.getSelection().classed('selected', false); } // merge the ports together @@ -273,7 +273,7 @@ // inform Angular app if the selection is changing if (selectAll) { - angularBridge.digest(); + nfNgBridge.digest(); } }, @@ -405,11 +405,11 @@ reload: function (component) { var componentData = component.datum(); if (componentData.permissions.canRead) { - if (canvasUtils.isProcessor(component)) { + if (nfCanvasUtils.isProcessor(component)) { nfProcessor.reload(componentData.id); - } else if (canvasUtils.isInputPort(component)) { + } else if (nfCanvasUtils.isInputPort(component)) { nfPort.reload(componentData.id); - } else if (canvasUtils.isRemoteProcessGroup(component)) { + } else if (nfCanvasUtils.isRemoteProcessGroup(component)) { nfRemoteProcessGroup.reload(componentData.id); } } http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js index 4c22c56..66ffe3b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js @@ -27,8 +27,8 @@ 'nf.CanvasUtils', 'nf.ng.Bridge', 'nf.Label'], - function ($, d3, errorHandler, common, client, canvasUtils, angularBridge, label) { - return (nf.LabelConfiguration = factory($, d3, errorHandler, common, client, canvasUtils, angularBridge, label)); + function ($, d3, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfNgBridge, nfLabel) { + return (nf.LabelConfiguration = factory($, d3, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfNgBridge, nfLabel)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.LabelConfiguration = @@ -50,7 +50,7 @@ root.nf.ng.Bridge, root.nf.Label); } -}(this, function ($, d3, errorHandler, common, client, canvasUtils, angularBridge, label) { +}(this, function ($, d3, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfNgBridge, nfLabel) { 'use strict'; var labelId = ''; @@ -82,7 +82,7 @@ // build the label entity var labelEntity = { - 'revision': client.getRevision(labelData), + 'revision': nfClient.getRevision(labelData), 'component': { 'id': labelId, 'label': labelValue, @@ -101,11 +101,11 @@ contentType: 'application/json' }).done(function (response) { // get the label out of the response - label.set(response); + nfLabel.set(response); // inform Angular app values have changed - angularBridge.digest(); - }).fail(errorHandler.handleAjaxError); + nfNgBridge.digest(); + }).fail(nfErrorHandler.handleAjaxError); // reset and hide the dialog this.modal('hide'); @@ -166,18 +166,18 @@ * @argument {selection} selection The selection */ showConfiguration: function (selection) { - if (canvasUtils.isLabel(selection)) { + if (nfCanvasUtils.isLabel(selection)) { var selectionData = selection.datum(); // get the label value var labelValue = ''; - if (common.isDefinedAndNotNull(selectionData.component.label)) { + if (nfCommon.isDefinedAndNotNull(selectionData.component.label)) { labelValue = selectionData.component.label; } // get the font size var fontSize = '12px'; - if (common.isDefinedAndNotNull(selectionData.component.style['font-size'])) { + if (nfCommon.isDefinedAndNotNull(selectionData.component.style['font-size'])) { fontSize = selectionData.component.style['font-size']; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js index fcec19d..382b7e0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js @@ -24,8 +24,8 @@ 'nf.Common', 'nf.Client', 'nf.CanvasUtils'], - function ($, d3, common, client, canvasUtils) { - return (nf.Label = factory($, d3, common, client, canvasUtils)); + function ($, d3, nfCommon, nfClient, nfCanvasUtils) { + return (nf.Label = factory($, d3, nfCommon, nfClient, nfCanvasUtils)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.Label = @@ -41,7 +41,7 @@ root.nf.Client, root.nf.CanvasUtils); } -}(this, function ($, d3, common, client, canvasUtils) { +}(this, function ($, d3, nfCommon, nfClient, nfCanvasUtils) { 'use strict'; var nfConnectable; @@ -114,7 +114,7 @@ 'class': 'label component' }) .classed('selected', selected) - .call(canvasUtils.position); + .call(nfCanvasUtils.position); // label border label.append('rect') @@ -187,7 +187,7 @@ var color = nfLabel.defaultColor(); // use the specified color if appropriate - if (common.isDefinedAndNotNull(d.component.style['background-color'])) { + if (nfCommon.isDefinedAndNotNull(d.component.style['background-color'])) { color = d.component.style['background-color']; } @@ -202,7 +202,7 @@ var label = d3.select(this); // update the component behavior as appropriate - canvasUtils.editable(label, nfConnectable, nfDraggable); + nfCanvasUtils.editable(label, nfConnectable, nfDraggable); // update the label var labelText = label.select('text.label-value'); @@ -213,7 +213,7 @@ var fontSize = '12px'; // use the specified color if appropriate - if (common.isDefinedAndNotNull(d.component.style['font-size'])) { + if (nfCommon.isDefinedAndNotNull(d.component.style['font-size'])) { fontSize = d.component.style['font-size']; } @@ -225,7 +225,7 @@ // parse the lines in this label var lines = []; - if (common.isDefinedAndNotNull(d.component.label)) { + if (nfCommon.isDefinedAndNotNull(d.component.label)) { lines = d.component.label.split('\n'); } else { lines.push(''); @@ -234,7 +234,7 @@ var color = nfLabel.defaultColor(); // use the specified color if appropriate - if (common.isDefinedAndNotNull(d.component.style['background-color'])) { + if (nfCommon.isDefinedAndNotNull(d.component.style['background-color'])) { color = d.component.style['background-color']; } @@ -247,8 +247,8 @@ return line; }) .style('fill', function (d) { - return common.determineContrastColor( - common.substringAfterLast( + return nfCommon.determineContrastColor( + nfCommon.substringAfterLast( color, '#')); }); }); @@ -308,12 +308,17 @@ /** * Initializes of the Processor handler. + * + * @param nfConnectableRef The nfConnectable module. + * @param nfDraggableRef The nfDraggable module. + * @param nfSelectableRef The nfSelectable module. + * @param nfContextMenuRef The nfContextMenu module. */ - init: function (connectable, draggable, selectable, contextMenu) { - nfConnectable = connectable; - nfDraggable = draggable; - nfSelectable = selectable; - nfContextMenu = contextMenu; + init: function (nfConnectableRef, nfDraggableRef, nfSelectableRef, nfContextMenuRef) { + nfConnectable = nfConnectableRef; + nfDraggable = nfDraggableRef; + nfSelectable = nfSelectableRef; + nfContextMenu = nfContextMenuRef; labelMap = d3.map(); removedCache = d3.map(); @@ -349,19 +354,19 @@ // determine if the width has changed var different = false; - if (common.isDefinedAndNotNull(labelData.component.width) || labelData.dimensions.width !== labelData.component.width) { + if (nfCommon.isDefinedAndNotNull(labelData.component.width) || labelData.dimensions.width !== labelData.component.width) { different = true; } // determine if the height has changed - if (!different && common.isDefinedAndNotNull(labelData.component.height) || labelData.dimensions.height !== labelData.component.height) { + if (!different && nfCommon.isDefinedAndNotNull(labelData.component.height) || labelData.dimensions.height !== labelData.component.height) { different = true; } // only save the updated bends if necessary if (different) { var labelEntity = { - 'revision': client.getRevision(labelData), + 'revision': nfClient.getRevision(labelData), 'component': { 'id': labelData.id, 'width': labelData.dimensions.width, @@ -381,13 +386,13 @@ }).fail(function () { // determine the previous width var width = dimensions.width; - if (common.isDefinedAndNotNull(labelData.component.width)) { + if (nfCommon.isDefinedAndNotNull(labelData.component.width)) { width = labelData.component.width; } // determine the previous height var height = dimensions.height; - if (common.isDefinedAndNotNull(labelData.component.height)) { + if (nfCommon.isDefinedAndNotNull(labelData.component.height)) { height = labelData.component.height; } @@ -415,8 +420,8 @@ */ add: function (labelEntities, options) { var selectAll = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; } // get the current time @@ -436,7 +441,7 @@ $.each(labelEntities, function (_, labelEntity) { add(labelEntity); }); - } else if (common.isDefinedAndNotNull(labelEntities)) { + } else if (nfCommon.isDefinedAndNotNull(labelEntities)) { add(labelEntities); } @@ -455,16 +460,16 @@ set: function (labelEntities, options) { var selectAll = false; var transition = false; - if (common.isDefinedAndNotNull(options)) { - selectAll = common.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; - transition = common.isDefinedAndNotNull(options.transition) ? options.transition : transition; + if (nfCommon.isDefinedAndNotNull(options)) { + selectAll = nfCommon.isDefinedAndNotNull(options.selectAll) ? options.selectAll : selectAll; + transition = nfCommon.isDefinedAndNotNull(options.transition) ? options.transition : transition; } var set = function (proposedLabelEntity) { var currentLabelEntity = labelMap.get(proposedLabelEntity.id); // set the processor if appropriate due to revision and wasn't previously removed - if (client.isNewerRevision(currentLabelEntity, proposedLabelEntity) && !removedCache.has(proposedLabelEntity.id)) { + if (nfClient.isNewerRevision(currentLabelEntity, proposedLabelEntity) && !removedCache.has(proposedLabelEntity.id)) { labelMap.set(proposedLabelEntity.id, $.extend({ type: 'Label' }, proposedLabelEntity)); @@ -486,14 +491,14 @@ $.each(labelEntities, function (_, labelEntity) { set(labelEntity); }); - } else if (common.isDefinedAndNotNull(labelEntities)) { + } else if (nfCommon.isDefinedAndNotNull(labelEntities)) { set(labelEntities); } // apply the selection and handle all new labels var selection = select(); selection.enter().call(renderLabels, selectAll); - selection.call(updateLabels).call(canvasUtils.position, transition); + selection.call(updateLabels).call(nfCanvasUtils.position, transition); selection.exit().call(removeLabels); }, @@ -504,7 +509,7 @@ * @param {string} id */ get: function (id) { - if (common.isUndefined(id)) { + if (nfCommon.isUndefined(id)) { return labelMap.values(); } else { return labelMap.get(id); @@ -518,7 +523,7 @@ * @param {string} id Optional */ refresh: function (id) { - if (common.isDefinedAndNotNull(id)) { + if (nfCommon.isDefinedAndNotNull(id)) { d3.select('#id-' + id).call(updateLabels); } else { d3.selectAll('g.label').call(updateLabels); @@ -550,7 +555,7 @@ * @param {string} id The id */ position: function (id) { - d3.select('#id-' + id).call(canvasUtils.position); + d3.select('#id-' + id).call(nfCanvasUtils.position); }, /**
