Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-11813: Fixed a bug in nf-processor-configuration.js that caused the UI to ignore the Scheduling Period when using a Timer-Driven strategy; removed some additional remnants of event-driven strategy from the UI 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #7518.
This commit is contained in:
Mark Payne 2023-07-24 10:21:28 -04:00 committed by Pierre Villard
parent ca2ee34bc2
commit c009b55762
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
View File

@ -96,10 +96,6 @@
<div type="text" id="scheduling-strategy-combo"></div> <div type="text" id="scheduling-strategy-combo"></div>
</div> </div>
</div> </div>
<div id="event-driven-warning" class="hidden">
<div class="processor-configuration-warning-icon"></div>
This strategy is experimental
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="timer-driven-options" class="setting"> <div id="timer-driven-options" class="setting">
@ -123,18 +119,6 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="event-driven-options" class="setting">
<div class="concurrently-schedulable-tasks-setting">
<div class="setting-name">
Concurrent tasks
<div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div>
</div>
<div class="setting-field">
<input type="text" id="event-driven-concurrently-schedulable-tasks" name="event-driven-concurrently-schedulable-tasks" class="small-setting-input"/>
</div>
</div>
<div class="clear"></div>
</div>
<div id="cron-driven-options" class="setting"> <div id="cron-driven-options" class="setting">
<div class="concurrently-schedulable-tasks-setting"> <div class="concurrently-schedulable-tasks-setting">
<div class="setting-name"> <div class="setting-name">

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
View File

@ -61,14 +61,6 @@ div.processor-enabled-container {
width: 20%; width: 20%;
} }
#event-driven-warning {
padding-top: 22px;
color: #f00;
float: left;
float: left;
margin-left: 10px;
}
div.processor-configuration-warning-icon { div.processor-configuration-warning-icon {
float: left; float: left;
margin-top: -2px; margin-top: -2px;

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
View File

@ -247,6 +247,8 @@
var schedulingPeriod; var schedulingPeriod;
if (schedulingStrategy === 'CRON_DRIVEN') { if (schedulingStrategy === 'CRON_DRIVEN') {
schedulingPeriod = $('#cron-driven-scheduling-period'); schedulingPeriod = $('#cron-driven-scheduling-period');
} else {
schedulingPeriod = $('#timer-driven-scheduling-period');
} }
// check the scheduling period // check the scheduling period
@ -311,6 +313,8 @@
var schedulingPeriod; var schedulingPeriod;
if (schedulingStrategy === 'CRON_DRIVEN') { if (schedulingStrategy === 'CRON_DRIVEN') {
schedulingPeriod = $('#cron-driven-scheduling-period'); schedulingPeriod = $('#cron-driven-scheduling-period');
} else {
schedulingPeriod = $('#timer-driven-scheduling-period');
} }
// get the scheduling period if appropriate // get the scheduling period if appropriate