You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2019/09/12 16:45:05 UTC
[nifi] branch master updated: NIFI-6634 - Indicate variables are no
longer recommended and favor parameters
This is an automated email from the ASF dual-hosted git repository.
mcgilman 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 2f7448c NIFI-6634 - Indicate variables are no longer recommended and favor parameters
2f7448c is described below
commit 2f7448c9e5ab010520d0567b1bba9300415720ce
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Wed Sep 11 14:02:56 2019 -0400
NIFI-6634 - Indicate variables are no longer recommended and favor parameters
This closes #3721
---
.../partials/canvas/variable-configuration.jsp | 4 +++-
.../nifi-web-ui/src/main/webapp/css/dialog.css | 2 ++
.../main/webapp/js/nf/canvas/nf-variable-registry.js | 19 +++++++++++++------
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/variable-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/variable-configuration.jsp
index 054de83..0e6fc27 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/variable-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/variable-configuration.jsp
@@ -80,7 +80,9 @@
</div>
</div>
</div>
- <div id="variable-message">Variables do not support sensitive values and will be included when versioning a Process Group.</div>
+ <div id="variable-message" class="ellipsis" title="Parameters are replacing variables. Learn more about the greater power and security of parameters.">
+ Parameters are replacing variables. <span id="parameters-documentation-link" class="link" title="Learn more about parameters">Learn more</span> about the greater power and security of parameters.
+ </div>
</div>
<div id="new-variable-dialog" class="dialog cancellable small-dialog hidden">
<div class="dialog-content">
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 ffad338..676956f 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
@@ -328,6 +328,8 @@ div.slick-cell div.overridden {
top: 550px;
left: 20px;
font-size: 13px;
+ max-width: calc(100% - 230px);
+ z-index: 999;
}
/*
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
index 8e77a8d..a4e0f4b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
@@ -35,9 +35,10 @@
'nf.ng.Bridge',
'nf.Processor',
'nf.ProcessGroup',
- 'nf.ProcessGroupConfiguration'],
- function ($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration) {
- return (nf.ComponentState = factory($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration));
+ 'nf.ProcessGroupConfiguration',
+ 'nf.Shell'],
+ function ($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration, nfShell) {
+ return (nf.ComponentState = factory($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration, nfShell));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ComponentState =
@@ -54,7 +55,8 @@
require('nf.ng.Bridge'),
require('nf.Processor'),
require('nf.ProcessGroup'),
- require('nf.ProcessGroupConfiguration')));
+ require('nf.ProcessGroupConfiguration'),
+ require('nf.Shell')));
} else {
nf.VariableRegistry = factory(root.$,
root.d3,
@@ -69,9 +71,10 @@
root.nf.ng.Bridge,
root.nf.Processor,
root.nf.ProcessGroup,
- root.nf.ProcessGroupConfiguration);
+ root.nf.ProcessGroupConfiguration,
+ root.nf.Shell);
}
-}(this, function ($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration) {
+}(this, function ($, d3, Slick, nfCanvas, nfCanvasUtils, nfErrorHandler, nfDialog, nfStorage, nfClient, nfCommon, nfNgBridge, nfProcessor, nfProcessGroup, nfProcessGroupConfiguration, nfShell) {
'use strict';
var lastSelectedId = null;
@@ -1644,6 +1647,10 @@
$('#new-variable-dialog').modal('show');
});
+ $('#parameters-documentation-link').on('click', function() {
+ nfShell.showPage('../nifi-docs/html/user-guide.html#Parameters');
+ });
+
initVariableTable();
},