Fix [Jobs Monitoring] Wrong number of the total jobs and workflows

mlrun · Dec 9, 2024 · 5627772 · 5627772
1 parent 995bee4
commit 5627772
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/src/components/ProjectsPage/projects.util.js b/src/components/ProjectsPage/projects.util.js
@@ -267,21 +267,21 @@ export const generateAlerts = (data, dispatch) => {
 export const generateMonitoringCounters = (data, dispatch) => {
   const monitoringCounters = {
     jobs: {
-      all: 0,
       completed: 0,
       failed: 0,
-      running: 0
+      running: 0,
+      total: 0
     },
     workflows: {
-      all: 0,
       completed: 0,
       failed: 0,
-      running: 0
+      running: 0,
+      total: 0
     },
     scheduled: {
-      all: 0,
       jobs: 0,
-      workflows: 0
+      workflows: 0,
+      total: 0
     },
     alerts: {
       endpoint: 0,
@@ -292,29 +292,23 @@ export const generateMonitoringCounters = (data, dispatch) => {
   }
 
   data.forEach(project => {
-    monitoringCounters.jobs.all += project.runs_completed_recent_count || 0
-    monitoringCounters.jobs.all += project.runs_failed_recent_count || 0
-    monitoringCounters.jobs.all += project.runs_running_count || 0
-    monitoringCounters.jobs.all +=
+    monitoringCounters.jobs.total +=
       project.runs_completed_recent_count ||
       0 + project.runs_failed_recent_count ||
       0 + project.runs_running_count ||
       0
     monitoringCounters.jobs.completed += project.runs_completed_recent_count || 0
     monitoringCounters.jobs.failed += project.runs_failed_recent_count || 0
     monitoringCounters.jobs.running += project.runs_running_count || 0
-    monitoringCounters.workflows.all += project.pipelines_completed_recent_count || 0
-    monitoringCounters.workflows.all += project.pipelines_failed_recent_count || 0
-    monitoringCounters.workflows.all += project.pipelines_running_count || 0
-    monitoringCounters.workflows.all +=
+    monitoringCounters.workflows.total +=
       project.pipelines_completed_recent_count ||
       0 + project.pipelines_failed_recent_count ||
       0 + project.pipelines_running_count ||
       0
     monitoringCounters.workflows.completed += project.pipelines_completed_recent_count || 0
     monitoringCounters.workflows.failed += project.pipelines_failed_recent_count || 0
     monitoringCounters.workflows.running += project.pipelines_running_count || 0
-    monitoringCounters.scheduled.all +=
+    monitoringCounters.scheduled.total +=
       project.distinct_scheduled_jobs_pending_count ||
       0 + project.distinct_scheduled_pipelines_pending_count ||
       0

diff --git a/src/elements/ProjectsMonitoringCounters/JobsCounters.js b/src/elements/ProjectsMonitoringCounters/JobsCounters.js
@@ -63,10 +63,10 @@ const JobsCounters = () => {
             ) : (
               <span
                 className="stats__link"
-                onClick={jobStats.all.link}
+                onClick={jobStats.total.link}
                 data-testid="jobs_total_counter"
               >
-                {jobStats.all.counter}
+                {jobStats.total.counter}
               </span>
             )}
           </span>

diff --git a/src/elements/ProjectsMonitoringCounters/ScheduledJobsCounters.js b/src/elements/ProjectsMonitoringCounters/ScheduledJobsCounters.js
@@ -106,10 +106,10 @@ const ScheduledJobsCounters = () => {
             ) : (
               <span
                 className="stats__link"
-                onClick={scheduledStats.all.link}
+                onClick={scheduledStats.total.link}
                 data-testid="scheduled_total_counter"
               >
-                {scheduledStats.all.counter}
+                {scheduledStats.total.counter}
               </span>
             )}
           </span>

diff --git a/src/elements/ProjectsMonitoringCounters/WorkflowsCounters.js b/src/elements/ProjectsMonitoringCounters/WorkflowsCounters.js
@@ -73,10 +73,10 @@ const WorkflowsCounters = () => {
             ) : (
               <span
                 className="stats__link"
-                onClick={workflowsStats.all.link}
+                onClick={workflowsStats.total.link}
                 data-testid="workflows_total_counter"
               >
-                {workflowsStats.all.counter}
+                {workflowsStats.total.counter}
               </span>
             )}
           </span>

diff --git a/src/utils/generateMonitoringData.js b/src/utils/generateMonitoringData.js
@@ -39,8 +39,8 @@ export const generateMonitoringStats = (data, navigate, tab) => {
 
   return tab === JOBS_MONITORING_JOBS_TAB
     ? {
-        all: {
-          counter: data.all || 0,
+        total: {
+          counter: data.total || 0,
           link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: [FILTER_ALL_ITEMS] })
         },
         counters: [
@@ -70,8 +70,8 @@ export const generateMonitoringStats = (data, navigate, tab) => {
       }
     : tab === JOBS_MONITORING_WORKFLOWS_TAB
       ? {
-          all: {
-            counter: data.all || 0,
+          total: {
+            counter: data.total || 0,
             link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: [FILTER_ALL_ITEMS] })
           },
           counters: [
@@ -101,8 +101,8 @@ export const generateMonitoringStats = (data, navigate, tab) => {
           ]
         }
       : {
-          all: {
-            counter: data.all || 0,
+          total: {
+            counter: data.total || 0,
             link: () => navigateToJobsMonitoringPage({ [TYPE_FILTER]: FILTER_ALL_ITEMS }, {})
           },
           jobs: {