From c009b55762b34d0518da0b3b98603a863ac03f09 Mon Sep 17 00:00:00 2001
From: Mark Payne <markap14@hotmail.com>
Date: Mon, 24 Jul 2023 10:21:28 -0400
Subject: [PATCH] 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.
---
 .../partials/canvas/processor-configuration.jsp  | 16 ----------------
 .../main/webapp/css/processor-configuration.css  |  8 --------
 .../js/nf/canvas/nf-processor-configuration.js   |  4 ++++
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
index 32d58329f6..1e42f3edca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
@@ -96,10 +96,6 @@
                                 <div type="text" id="scheduling-strategy-combo"></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>
                     <div id="timer-driven-options" class="setting">
@@ -123,18 +119,6 @@
                         </div>
                         <div class="clear"></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 class="concurrently-schedulable-tasks-setting">
                             <div class="setting-name">
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
index c38054525a..a8af327559 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
@@ -61,14 +61,6 @@ div.processor-enabled-container {
     width: 20%;
 }
 
-#event-driven-warning {
-    padding-top: 22px;
-    color: #f00;
-    float: left;
-    float: left;
-    margin-left: 10px;
-}
-
 div.processor-configuration-warning-icon {
     float: left;
     margin-top: -2px;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
index b6f39c5a57..856a73a4cf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
@@ -247,6 +247,8 @@
         var schedulingPeriod;
         if (schedulingStrategy === 'CRON_DRIVEN') {
             schedulingPeriod = $('#cron-driven-scheduling-period');
+        } else {
+            schedulingPeriod = $('#timer-driven-scheduling-period');
         }
 
         // check the scheduling period
@@ -311,6 +313,8 @@
         var schedulingPeriod;
         if (schedulingStrategy === 'CRON_DRIVEN') {
             schedulingPeriod = $('#cron-driven-scheduling-period');
+        } else {
+            schedulingPeriod = $('#timer-driven-scheduling-period');
         }
 
         // get the scheduling period if appropriate