[nifi] 12/12: NIFI-6506 - don't show 'Sensitive value set' for null, sensitive params'

[sc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit fa8a4462e73a7ef417b23644edb9629f2955c0b0
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Thu Sep 5 10:33:39 2019 -0400

    NIFI-6506 - don't show 'Sensitive value set' for null, sensitive params'
    
    This closes #3683
    
    Signed-off-by: Scott Aslan <sc...@gmail.com>
---
 .../webapp/js/nf/canvas/nf-parameter-contexts.js     | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
index 63f3da8..f2a73c4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
@@ -1443,7 +1443,7 @@
         };
 
         var valueFormatter = function (row, cell, value, columnDef, dataContext) {
-            if (dataContext.sensitive === true) {
+            if (dataContext.sensitive === true && !_.isNil(value)) {
                 return '<span class="table-cell sensitive">Sensitive value set</span>';
             } else if (value === '') {
                 return '<span class="table-cell blank">Empty string set</span>';
@@ -1532,10 +1532,16 @@
 
                 // determine the desired action
                 if (target.hasClass('delete-parameter')) {
-                    // mark the property in question for removal and refresh the table
-                    parameterData.updateItem(parameter.id, $.extend(parameter, {
-                        hidden: true
-                    }));
+                    if (!parameter.isNew) {
+                        // mark the parameter in question for removal and refresh the table
+                        parameterData.updateItem(parameter.id, $.extend(parameter, {
+                            hidden: true
+                        }));
+                    } else {
+                        // remove the parameter from the table
+                        parameterData.deleteItem(parameter.id);
+                    }
+
 
                     // reset the selection if necessary
                     var selectedRows = parametersGrid.getSelectedRows();
@@ -1598,7 +1604,9 @@
                         if (parameter.sensitive) {
                             $('#parameter-sensitive-radio-button').prop('checked', true);
                             $('#parameter-not-sensitive-radio-button').prop('checked', false);
-                            $('#parameter-value-field').addClass('sensitive').val(nfCommon.config.sensitiveText).select();
+                            if (!_.isNil(parameter.value)) {
+                                $('#parameter-value-field').addClass('sensitive').val(nfCommon.config.sensitiveText).select();
+                            }
                         } else {
                             $('#parameter-sensitive-radio-button').prop('checked', false);
                             $('#parameter-not-sensitive-radio-button').prop('checked', true);