Repository: nifi Updated Branches: refs/heads/master df0e4e796 -> 806f4d549
http://git-wip-us.apache.org/repos/asf/nifi/blob/806f4d54/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 469dcba..9d77813 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 @@ -21,22 +21,21 @@ nf.CustomUi = { /** * Shows the custom ui. * - * @argument {string} id The component id - * @argument {string} uri The uri for the custom ui + * @argument {object} entity The component id + * @arugment {string} uri The custom ui uri * @argument {boolean} editable Whether the custom ui should support editing */ - showCustomUi: function (id, uri, editable) { + showCustomUi: function (entity, uri, editable) { return $.Deferred(function (deferred) { nf.Common.getAccessToken('../nifi-api/access/ui-extension-token').done(function (uiExtensionToken) { // record the processor id $('#shell-close-button'); - var revision = nf.Client.getRevision(); + var revision = nf.Client.getRevision(entity); // build the customer ui params var customUiParams = { - 'id': id, - 'processorId': id, // deprecated + 'id': entity.id, 'revision': revision.version, 'clientId': revision.clientId, 'editable': editable http://git-wip-us.apache.org/repos/asf/nifi/blob/806f4d54/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-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-processor-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js index 49efc33..ba9191e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js @@ -590,12 +590,13 @@ nf.ProcessorConfiguration = (function () { } // once everything is loaded, show the dialog - $.when.apply(window, requests).done(function (processorResponse, historyResponse) { - // get the updated processor - processor = processorResponse[0].component; + $.when.apply(window, requests).done(function (processorResult, historyResult) { + // get the updated processor' + var processorResponse = processorResult[0]; + processor = processorResponse.component; // get the processor history - var processorHistory = historyResponse[0].componentHistory; + var processorHistory = historyResult[0].componentHistory; // record the processor details $('#processor-configuration').data('processorDetails', processor); @@ -747,7 +748,7 @@ nf.ProcessorConfiguration = (function () { $('#processor-configuration').modal('hide'); // show the custom ui - nf.CustomUi.showCustomUi($('#processor-id').text(), processor.config.customUiUrl, true).done(function () { + nf.CustomUi.showCustomUi(processorResponse, processor.config.customUiUrl, true).done(function () { // once the custom ui is closed, reload the processor nf.Processor.reload(processor); http://git-wip-us.apache.org/repos/asf/nifi/blob/806f4d54/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index ae31021..1efc9e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -355,7 +355,6 @@ nf.ReportingTask = (function () { // initialize the property table $('#reporting-task-properties').propertytable({ readOnly: false, - groupId: nf.Canvas.getGroupId(), dialogContainer: '#new-reporting-task-property-container', descriptorDeferred: getReportingTaskPropertyDescriptor, goToServiceDeferred: goToServiceFromProperty @@ -377,7 +376,6 @@ nf.ReportingTask = (function () { // initialize the property table $('#reporting-task-properties').propertytable('destroy').propertytable({ readOnly: false, - groupId: nf.Canvas.getGroupId(), dialogContainer: '#new-reporting-task-property-container', descriptorDeferred: getReportingTaskPropertyDescriptor, goToServiceDeferred: goToServiceFromProperty @@ -503,7 +501,7 @@ nf.ReportingTask = (function () { $('#shell-close-button').click(); // show the custom ui - nf.CustomUi.showCustomUi($('#reporting-task-id').text(), reportingTask.customUiUrl, true).done(function () { + nf.CustomUi.showCustomUi(reportingTaskEntity, reportingTask.customUiUrl, true).done(function () { // once the custom ui is closed, reload the reporting task nf.ReportingTask.reload(reportingTaskEntity.id).done(function (response) { nf.ControllerService.reloadReferencedServices(getControllerServicesTable(), response.reportingTask); @@ -634,7 +632,7 @@ nf.ReportingTask = (function () { $('#shell-close-button').click(); // show the custom ui - nf.CustomUi.showCustomUi(reportingTask.id, reportingTask.customUiUrl, false).done(function() { + nf.CustomUi.showCustomUi(reportingTaskEntity, reportingTask.customUiUrl, false).done(function() { nf.Settings.showSettings(); }); } http://git-wip-us.apache.org/repos/asf/nifi/blob/806f4d54/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js index ee6e2ab..9915fe0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js @@ -209,10 +209,10 @@ nf.ProcessorDetails = (function () { }); // show the dialog once we have the processor and its history - $.when(getProcessor, getProcessorHistory).done(function (processorResponse, historyResponse) { - var processorResponse = processorResponse[0]; + $.when(getProcessor, getProcessorHistory).done(function (processorResult, historyResult) { + var processorResponse = processorResult[0]; var processor = processorResponse.component; - var historyResponse = historyResponse[0]; + var historyResponse = historyResult[0]; var history = historyResponse.componentHistory; // load the properties @@ -238,7 +238,7 @@ nf.ProcessorDetails = (function () { $('#processor-details').modal('hide'); // show the custom ui - nf.CustomUi.showCustomUi(processor.id, processor.config.customUiUrl, false); + nf.CustomUi.showCustomUi(processorResponse, processor.config.customUiUrl, false); } } });
