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 93d99820b775b48905ad670ad5bcda7b7535186f Author: Rob Fellows <[email protected]> AuthorDate: Wed Sep 4 10:45:52 2019 -0400 NIFI-6506 - more review fixes --- .../canvas/new-parameter-context-dialog.jsp | 2 +- .../nifi-web-ui/src/main/webapp/css/dialog.css | 20 +--------------- .../webapp/css/new-parameter-context-dialog.css | 20 ++++++++++++++++ .../webapp/js/nf/canvas/nf-parameter-contexts.js | 28 ++++++++++++++-------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp index 3735355..cf1f56b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp @@ -119,7 +119,7 @@ </div> <div id="parameter-context-updating-status"> <div class='parameter-context-step ajax-loading'></div> - <div class='status-message'>Updating parameter context</div> + <div class='status-message ellipsis'>Updating parameter context</div> </div> </div> <div id="referencing-components-template" class="referencing-components-template hidden clear"> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css index 0503100..ffad338 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css @@ -379,27 +379,9 @@ div.variable-step { } div.parameter-context-step { + min-width: 16px; width: 16px; height: 16px; background-color: transparent; float: right; } - -#parameter-context-updating-status { - display: none; - position: absolute; - left: 12px; - bottom: 0; - height: 32px; -} - -#parameter-context-updating-status.show-status { - display: flex; - flex-direction: row; - align-items: center; -} - -#parameter-context-updating-status .status-message { - white-space: nowrap; - margin-left: 6px; -} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css index 2ccb910..8c7501b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css @@ -101,3 +101,23 @@ span.parameter-context-referencing-component-name { margin-right: 5px; max-width: calc(100% - 10px); } + +#parameter-context-updating-status { + display: none; + position: absolute; + left: 12px; + bottom: 0; + height: 32px; + max-width: calc(100% - 230px); +} + +#parameter-context-updating-status.show-status { + display: flex; + flex-direction: row; + align-items: center; +} + +#parameter-context-updating-status .status-message { + white-space: nowrap; + margin-left: 6px; +} 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 fdafdfb..d9aadf0 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 @@ -217,6 +217,21 @@ }; /** + * Resets all of the fields in the add/edit parameter dialog + */ + var resetParameterDialog = 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'); + }; + + /** * Marshals the parameters in the table. */ var marshalParameters = function () { @@ -1600,7 +1615,7 @@ }, disabled: function () { var param = serializeParameter(parameter); - if (_.isEmpty(param.value) && !param.isEmptyStringSet) { + if (_.isEmpty(param.value) && !param.isEmptyStringSet && !param.sensitive) { // must have a value when editing return true; } else { @@ -1766,15 +1781,7 @@ $('#add-parameter').on('click', function () { 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 () { @@ -2480,6 +2487,7 @@ clearTimeout(updateTimeoutReference); } } + resetParameterDialog(); // hide the dialog $(this).modal('hide');
