[nifi] branch master updated: NIFI-6587 - Fix: Unable save sensitive property value that equals masked value

[scottyaslan]

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


The following commit(s) were added to refs/heads/master by this push:
     new 2493665  NIFI-6587 - Fix: Unable save sensitive property value that 
equals masked value
2493665 is described below

commit 2493665c2758f1568225d9f6b8e6bd5acd411aed
Author: Rob Fellows <rob.fell...@gmail.com>
AuthorDate: Mon Sep 30 11:17:16 2019 -0400

    NIFI-6587 - Fix: Unable save sensitive property value that equals masked 
value
    
    This closes #3778
    
    Signed-off-by: Scott Aslan <scottyas...@gmail.com>
---
 .../src/main/webapp/js/nf/canvas/nf-parameter-contexts.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 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 66e9d35..c86df4d 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
@@ -958,6 +958,11 @@
             } else {
                 // value is not sensitive or it is sensitive and the user has 
changed it then always take the current value
                 serializedValue = value;
+
+                // if the param is sensitive and the param value has not 
"changed", that means it matches the mask and it should still be considered 
changed
+                if (!hasChanged && !_.isEmpty(parameter) && 
parameter.sensitive === true && parameter.isNew === false) {
+                    hasChanged = true;
+                }
             }
         } else {
             if (isChecked) {
@@ -1610,15 +1615,7 @@
                     e.stopImmediatePropagation();
                 } else if (target.hasClass('edit-parameter')) {
                     var closeHandler = function () {
-                        $('#parameter-name').val('');
-                        $('#parameter-value-field').val('');
-                        $('#parameter-description-field').val('');
-                        $('#parameter-sensitive-radio-button').prop('checked', 
false);
-                        
$('#parameter-not-sensitive-radio-button').prop('checked', false);
-                        $('#parameter-name').prop('disabled', false);
-                        
$('#parameter-sensitive-radio-button').prop('disabled', false);
-                        
$('#parameter-not-sensitive-radio-button').prop('disabled', false);
-                        
$('#parameter-set-empty-string-field').removeClass('checkbox-checked').addClass('checkbox-unchecked');
+                        resetParameterDialog();
                     };
 
                     var openHandler = function () {