HPCC-30836 ECL Watch add jobname to event scheduler filter

Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Nov 16, 2023 · c1bed6d · c1bed6d
1 parent bf5031a
commit c1bed6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/esp/src/eclwatch/templates/EventScheduleWorkunitWidget.html b/esp/src/eclwatch/templates/EventScheduleWorkunitWidget.html
@@ -10,8 +10,9 @@
           <span data-dojo-type="dijit.ToolbarSeparator"></span>
           <div id="${id}Filter" data-dojo-type="FilterDropDownWidget">
             <input id="${id}EventName" title="${i18n.EventName}:" name="EventName" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.EventNamePH}'" data-dojo-type="dijit.form.TextBox" />
-            <input id="${id}State" title="${i18n.State}:" name="State" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.State}'" data-dojo-type="dijit.form.TextBox" />
-            <input id="${id}Owner" title="${i18n.Owner}:" name="Owner" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.Owner}'" data-dojo-type="dijit.form.TextBox" />
+            <input id="${id}JobName" title="${i18n.JobName}:" name="JobName" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.log_analysis_1}'" data-dojo-type="dijit.form.TextBox" />
+            <input id="${id}State" title="${i18n.State}:" name="State" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.Compiled}'" data-dojo-type="dijit.form.TextBox" />
+            <input id="${id}Owner" title="${i18n.Owner}:" name="Owner" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.jsmi}'" data-dojo-type="dijit.form.TextBox" />
             <input id="${id}EventTextFilter" title="${i18n.EventText}:" name="EventText" colspan="2" data-dojo-props="trim: true, placeHolder:'${i18n.EventTextPH}'" data-dojo-type="dijit.form.TextBox" />
             <input id="${id}ClusterTargetSelect" title="${i18n.Cluster}:" name="Cluster" colspan="2" data-dojo-props="trim:true, placeHolder:'${i18n.ClusterPlaceholder}'" data-dojo-type="TargetSelectWidget" />
           </div>

diff --git a/esp/src/src-react/components/EventScheduler.tsx b/esp/src/src-react/components/EventScheduler.tsx
@@ -19,7 +19,8 @@ import { useMyAccount } from "../hooks/user";
 const logger = scopedLogger("src-react/components/EventScheduler.tsx");
 
 const FilterFields: Fields = {
-    "EventName": { type: "string", label: nlsHPCC.EventName },
+    "EventName": { type: "string", label: nlsHPCC.EventName, placeholder: nlsHPCC.EventNamePH },
+    "JobName": { type: "string", label: nlsHPCC.JobName, placeholder: nlsHPCC.log_analysis_1 },
     "State": { type: "workunit-state", label: nlsHPCC.State, placeholder: "" },
     "Owner": { type: "string", label: nlsHPCC.Owner, placeholder: nlsHPCC.jsmi },
     "EventText": { type: "string", label: nlsHPCC.EventText, placeholder: nlsHPCC.EventTextPH },