add run and maxRuns to job view

Author: marle3003

engine/common/host.go

@@ -118,6 +118,8 @@ type Log struct {
 
 type JobExecution struct {
 	Schedule string `json:"scheduled"`
+	MaxRuns  int    `json:"maxRuns"`
+	Runs     int    `json:"runs"`
 
 	Duration int64             `json:"duration"`
 	Tags     map[string]string `json:"tags"`

engine/engine_test.go

@@ -36,6 +36,8 @@ func TestEngine_Scheduler(t *testing.T) {
 				r.Equal(t, "test.js", exec.Tags["name"])
 				r.Greater(t, exec.Duration, int64(0))
 				r.Equal(t, "1s", exec.Schedule)
+				r.Equal(t, -1, exec.MaxRuns)
+				r.Equal(t, 1, exec.Runs)
 
 				r.Equal(t, float64(1), c.Value())
 			},

engine/host.go

@@ -136,6 +136,7 @@ func (sh *scriptHost) newJobFunc(handler func(), opt common.JobOptions, schedule
 	if len(events.GetStores(t)) == 1 {
 		events.SetStore(int(sh.engine.cfgEvent.Store["Default"].Size), t)
 	}
+	counter := 1
 
 	return func() {
 		sh.Lock()
@@ -145,6 +146,8 @@ func (sh *scriptHost) newJobFunc(handler func(), opt common.JobOptions, schedule
 
 		exec := common.JobExecution{
 			Schedule: schedule,
+			MaxRuns:  opt.Times,
+			Runs:     counter,
 			Tags:     tags,
 		}
 
@@ -169,6 +172,7 @@ func (sh *scriptHost) newJobFunc(handler func(), opt common.JobOptions, schedule
 		handler()
 
 		exec.Duration = time.Now().Sub(start).Milliseconds()
+		counter++
 	}
 }
 

examples/mokapi/http_handler.js

@@ -150,6 +150,8 @@ export default async function() {
         time: '2025-05-01T08:49:25.482366+01:00',
         data: {
             schedule: '3s',
+            maxRuns: -1,
+            runs: 1,
             duration: 2300,
             tags: {
                 name: "cron",

webui/src/components/dashboard/JobCard.vue

@@ -33,6 +33,8 @@ function eventData(event: ServiceEvent | null): JobExecution | null{
                     <th scope="col" class="text-left" style="width: 30px;"></th>
                     <th scope="col" class="text-left">Name</th>
                     <th scope="col" class="text-left">Schedule</th>
+                    <th scope="col" class="text-center" style="width:10%">Runs</th>
+                    <th scope="col" class="text-center" style="width:10%">Max Runs</th>
                     <th scope="col" class="text-center" style="width:15%">Time</th>
                     <th scope="col" class="text-center" style="width: 10%">Duration</th>
                 </tr>
@@ -43,11 +45,13 @@ function eventData(event: ServiceEvent | null): JobExecution | null{
                         <td><i class="bi bi-chevron-right"></i><i class="bi bi-chevron-down"></i></td>
                         <td>{{ data!.tags.name }}</td>
                         <td>{{ data!.schedule }}</td>
+                        <td class="text-center">{{ data!.runs }}</td>
+                        <td class="text-center">{{ data!.maxRuns === -1 ? '-' : data!.maxRuns }}</td>
                         <td class="text-center">{{ format(event.time) }}</td>
                         <td class="text-center">{{ duration(data!.duration) }}</td>
                     </tr>
                     <tr class="collapse-row" :set="data = eventData(event)">
-                        <td colspan="5" v-if="data" >
+                        <td colspan="7" v-if="data" >
                             <div class="collapse" :id="'event_'+index" style="padding: 2rem;">
                                 <h5>Logs</h5>
                                 <div class="mb-3">

webui/src/types/index.d.ts

@@ -33,6 +33,8 @@ interface Data {
 
 interface JobExecution {
   schedule: string
+  maxRuns: number
+  runs: number
   duration: number
   tags: { [name: string]: string}
   logs: { level: string, message: string}[]