You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2019/09/05 18:07:25 UTC
[nifi] 05/12: NIFI-6505 - fixing issues uncovered in code review.
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 385c06750705c280f0768f214d3c5bfb63b4b4ef
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Wed Sep 4 08:41:53 2019 -0400
NIFI-6505 - fixing issues uncovered in code review.
---
.../webapp/js/nf/canvas/nf-parameter-contexts.js | 31 +++++++++++++---------
1 file changed, 18 insertions(+), 13 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 3fdc7f0..083138e 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
@@ -810,7 +810,7 @@
* Builds a parameter object from the user-entered parameter inputs
*
* @param originalParameter Optional parameter to compare value against to determine if it has changed
- * @return {{isEmptyStringSet: *, name: *, description: *, sensitive: *, value: *}}
+ * @return {{isEmptyStringSet: *, name: *, description: *, sensitive: *, value: *, hasValueChanged: *, hasDescriptionChanged: *}}
*/
var serializeParameter = function (originalParameter) {
var name = $.trim($('#parameter-name').val());
@@ -821,8 +821,8 @@
var parameter = {
name: name,
- value: value,
- description: description,
+ value: null,
+ description: null,
sensitive: isSensitive,
isEmptyStringSet: isEmptyStringSet,
previousValue: null,
@@ -837,7 +837,8 @@
description: description,
sensitive: isSensitive,
isEmptyStringSet: isEmptyStringSet,
- hasValueChanged: serializedValue.hasChanged
+ hasValueChanged: serializedValue.hasChanged,
+ hasDescriptionChanged: description !== _.get(originalParameter, 'description', '')
}
};
@@ -904,9 +905,10 @@
var serializeValue = function (input, parameter, isChecked) {
var serializedValue;
- var hasChanged = parameter.value !== parameter.previousValue;
var value = input.val();
+ var hasChanged = parameter.value !== value;
+
if (!nfCommon.isBlank(value)) {
// if the value is sensitive and the user has not made a change
if (!_.isEmpty(parameter) && parameter.sensitive === true && input.hasClass('sensitive') && parameter.isNew === false) {
@@ -957,7 +959,8 @@
isEmptyStringSet: serializedParam.isEmptyStringSet,
isNew: originalParameter.isNew,
hasValueChanged: serializedParam.hasValueChanged,
- isModified: serializedParam.hasValueChanged || serializedParam.description !== originalParameter.description
+ hasDescriptionChanged: serializedParam.hasDescriptionChanged,
+ isModified: serializedParam.hasValueChanged || serializedParam.hasDescriptionChanged
});
// update row for the parameter
@@ -1032,11 +1035,10 @@
text: '#ffffff'
},
disabled: function () {
- var param = serializeParameter();
- if (_.isEmpty(param.name) || (_.isNil(param.value) && !param.isEmptyStringSet)) {
- return true;
+ if ($('#parameter-context-name').val() !== '') {
+ return false;
}
- return false;
+ return true;
},
handler: {
click: function () {
@@ -1596,7 +1598,12 @@
},
disabled: function () {
var param = serializeParameter(parameter);
- return !param.hasValueChanged && param.description === parameter.description;
+ if (_.isEmpty(param.value) && !param.isEmptyStringSet) {
+ // must have a value when editing
+ return true;
+ } else {
+ return !param.hasValueChanged && !param.hasDescriptionChanged;
+ }
},
handler: {
click: function () {
@@ -1889,8 +1896,6 @@
}
}])
.modal('show');
-
- $('#parameter-dialog').modal('show');
};
/**