This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 0e806a19a1 NIFI-11874: update process group configuration dialog UI,
specific to nifi-1.x line (#7844)
0e806a19a1 is described below
commit 0e806a19a18024c495516cd0f0f276a959fc328f
Author: markobean <[email protected]>
AuthorDate: Fri Oct 20 14:48:46 2023 -0400
NIFI-11874: update process group configuration dialog UI, specific to
nifi-1.x line (#7844)
This closes #7844
---
.../canvas/process-group-configuration.jsp | 181 +++++++++++----------
.../webapp/css/process-group-configuration.css | 9 +
2 files changed, 105 insertions(+), 85 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
index 509a3d9677..f54f5a1314 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
@@ -26,96 +26,107 @@
<button id="add-process-group-configuration-controller-service"
class="add-button fa fa-plus" title="Create a new controller service"></button>
<div id="general-process-group-configuration-tab-content"
class="configuration-tab">
<div id="general-process-group-configuration">
- <div class="setting">
- <div class="setting-name">Process group name</div>
- <span id="process-group-id" class="hidden"></span>
- <div class="editable setting-field">
- <input type="text" id="process-group-name"
class="setting-input"/>
- </div>
- <div class="read-only setting-field">
- <span id="read-only-process-group-name"
class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Process group parameter
context</div>
- <div class="editable setting-field">
- <div
id="process-group-parameter-context-combo"></div>
- </div>
- <div class="read-only setting-field">
- <span
id="read-only-process-group-parameter-context" class="unset">Unauthorized</span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Process group comments</div>
- <div class="editable setting-field">
- <textarea id="process-group-comments"
class="setting-input"></textarea>
- </div>
- <div class="read-only setting-field">
- <span id="read-only-process-group-comments"
class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Process group FlowFile
concurrency</div>
- <div class="editable setting-field">
- <div
id="process-group-flowfile-concurrency-combo"></div>
- </div>
- <div class="read-only setting-field">
- <span
id="read-only-process-group-flowfile-concurrency" class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Process group outbound
policy</div>
- <div class="editable setting-field">
- <div
id="process-group-outbound-policy-combo"></div>
- </div>
- <div class="read-only setting-field">
- <span id="read-only-process-group-outbound-policy"
class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Default FlowFile
Expiration</div>
- <div class="editable setting-field">
- <input type="text"
id="process-group-default-flowfile-expiration" class="setting-input"/>
- </div>
- <div class="read-only setting-field">
- <span
id="read-only-process-group-default-flowfile-expiration" class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Default Back Pressure Object
Threshold</div>
- <div class="editable setting-field">
- <input type="text"
id="process-group-default-back-pressure-object-threshold"
class="setting-input"/>
- </div>
- <div class="read-only setting-field">
- <span
id="read-only-process-group-default-back-pressure-object-threshold"
class="unset"></span>
- </div>
- </div>
- <div class="setting">
- <div class="setting-name">Default Back Pressure Data
Size Threshold</div>
- <div class="editable setting-field">
- <input type="text"
id="process-group-default-back-pressure-data-size-threshold"
class="setting-input"/>
- </div>
- <div class="read-only setting-field">
- <span
id="read-only-process-group-default-back-pressure-data-size-threshold"
class="unset"></span>
+ <div class="settings-columns">
+ <div class="settings-column">
+ <div class="setting">
+ <div class="setting-name">Process group
name</div>
+ <span id="process-group-id"
class="hidden"></span>
+ <div class="editable setting-field">
+ <input type="text" id="process-group-name"
class="setting-input"/>
+ </div>
+ <div class="read-only setting-field">
+ <span id="read-only-process-group-name"
class="unset"></span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Process group
parameter context</div>
+ <div class="editable setting-field">
+ <div
id="process-group-parameter-context-combo"></div>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-parameter-context" class="unset">Unauthorized</span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Process group
FlowFile concurrency</div>
+ <div class="editable setting-field">
+ <div
id="process-group-flowfile-concurrency-combo"></div>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-flowfile-concurrency" class="unset"></span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Process group
outbound policy</div>
+ <div class="editable setting-field">
+ <div
id="process-group-outbound-policy-combo"></div>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-outbound-policy" class="unset"></span>
+ </div>
+ </div>
+ </div>
+ <div class="settings-column">
+ <div class="setting">
+ <div class="setting-name">Default FlowFile
Expiration
+ <div class="fa fa-question-circle"
alt="Info" title="This setting applies as the default FLowFile expiration for
any new connection. Configuration of existing connections is unaffected."></div>
+ </div>
+ <div class="editable setting-field">
+ <input type="text"
id="process-group-default-flowfile-expiration" class="setting-input"/>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-default-flowfile-expiration" class="unset"></span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Default Back
Pressure Object Threshold
+ <div class="fa fa-question-circle"
alt="Info" title="This setting applies as the default back pressure object
count for any new connection. Configuration of existing connections is
unaffected."></div>
+ </div>
+ <div class="editable setting-field">
+ <input type="text"
id="process-group-default-back-pressure-object-threshold"
class="setting-input"/>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-default-back-pressure-object-threshold"
class="unset"></span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Default Back
Pressure Data Size Threshold
+ <div class="fa fa-question-circle"
alt="Info" title="This setting applies as the default back pressure data size
for any new connection. Configuration of existing connections is
unaffected."></div>
+ </div>
+ <div class="editable setting-field">
+ <input type="text"
id="process-group-default-back-pressure-data-size-threshold"
class="setting-input"/>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-default-back-pressure-data-size-threshold"
class="unset"></span>
+ </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Log File Suffix
+ <div class="fa fa-question-circle"
alt="Info" title="Turns on dedicated logging. When left empty log messages will
be logged only to the primary app log. When set messages logged by components
in this group will be sent to the standard app log, as well as a separate log
file, with the provided name, specific to this group."></div>
+ </div>
+ <div class="editable setting-field">
+ <input type="text"
id="process-group-log-file-suffix" class="setting-input"/>
+ </div>
+ <div class="read-only setting-field">
+ <span
id="read-only-process-group-log-file-suffix" class="unset"></span>
+ </div>
+ </div>
</div>
</div>
- <div class="setting">
- <div class="setting-name">Log File Suffix
- <div class="fa fa-question-circle" alt="Info"
title="Turns on dedicated logging. When left empty log messages will be logged
only to the primary app log. When set messages logged by components in this
group will be sent to the standard app log, as well as a separate log file,
with the provided name, specific to this group."></div>
- </div>
- <div class="editable setting-field">
- <input type="text"
id="process-group-log-file-suffix" class="setting-input"/>
- </div>
- <div class="read-only setting-field">
- <span id="read-only-process-group-log-file-suffix"
class="unset"></span>
- </div>
+ </div>
+ <div class="setting">
+ <div class="setting-name">Process group comments</div>
+ <div class="editable setting-field">
+ <textarea id="process-group-comments"
class="setting-input"></textarea>
</div>
-
- <div class="editable settings-buttons">
- <div id="process-group-configuration-save"
class="button">Apply</div>
- <div class="clear"></div>
+ <div class="read-only setting-field">
+ <span id="read-only-process-group-comments"
class="unset"></span>
</div>
</div>
+ <div class="editable settings-buttons">
+ <div id="process-group-configuration-save"
class="button">Apply</div>
+ <div class="clear"></div>
+ </div>
</div>
<div id="process-group-controller-services-tab-content"
class="configuration-tab">
<div id="process-group-controller-services-table"
class="settings-table"></div>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
index 20cfaec23e..b340e9610f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
@@ -76,6 +76,14 @@
/* general */
+#general-process-group-configuration div.settings-columns {
+ display: flex;
+}
+
+#general-process-group-configuration div.settings-columns .settings-column {
+ margin-right: 50px;
+}
+
#general-process-group-configuration input,
#general-process-group-configuration textarea {
width: 350px;
vertical-align: middle;
@@ -107,6 +115,7 @@
#process-group-comments {
height: 100px;
+ width: 750px;
}
#read-only-process-group-comments {
