From c88fe74e251233a951608baf0e732a147a680cb1 Mon Sep 17 00:00:00 2001
From: plakkara <preethi.lakkaraju@gov.bc.ca>
Date: Tue, 4 Aug 2026 18:26:58 -0400
Subject: [PATCH 1/4] updated filters for job column

---
 frontend/src/components/JobMonitoringTab.tsx | 27 +++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/JobMonitoringTab.tsx b/frontend/src/components/JobMonitoringTab.tsx
index 206655f5..71dfce7c 100644
--- a/frontend/src/components/JobMonitoringTab.tsx
+++ b/frontend/src/components/JobMonitoringTab.tsx
@@ -60,7 +60,6 @@ const STATUS_TO_API: Record<string, string> = {
   Running: 'RUNNING',
   Failed: 'FAILED',
 }
-const TRIGGER_OPTIONS = ['SYSTEM', 'USER']
 const ACTIVITY_SEVERITIES = ['ERROR', 'WARNING', 'CRITICAL']
 const ACTIVITY_TYPES = ['DATA_QUALITY', 'JOB', 'CRA', 'WKL', 'ICM', 'BATCH']
 const ACTIVITY_TYPE_LABELS: Record<string, string> = {
@@ -110,7 +109,7 @@ const normalizeStatus = (status: string): string => {
 const matchesTriggerFilter = (triggeredBy: string, filter: string): boolean => {
   if (!filter) return true
   if (filter === 'USER') return triggeredBy !== 'SYSTEM'
-  return triggeredBy === filter
+  return triggeredBy.toUpperCase() === filter.toUpperCase()
 }
 
 const normalizeSeverity = (severity: string): string => {
@@ -619,6 +618,26 @@ export default function JobMonitoringTab() {
     actSortField !== 'when' ||
     actSortOrder !== 'desc'
 
+  // Build trigger filter options from loaded monitoring data.
+  // Keep SYSTEM first, followed by discovered IDIRs in alphabetical order.
+  const triggerOptions = (() => {
+    const found = new Set<string>()
+    const add = (value: string | null | undefined) => {
+      const normalized = (value || '').trim().toUpperCase()
+      if (!normalized) return
+      found.add(normalized)
+    }
+
+    jobListData.forEach((row) => add(row.triggeredBy))
+    jobHistoryData.forEach((row) => add(row.triggeredBy))
+
+    const sortedIdirs = Array.from(found)
+      .filter((v) => v !== 'SYSTEM')
+      .sort((a, b) => a.localeCompare(b))
+
+    return found.has('SYSTEM') ? ['SYSTEM', ...sortedIdirs] : sortedIdirs
+  })()
+
   // ── Job List: client-side filter + sort ──────────────────────────────────
   const filteredJobList = jobListData
     .filter((row) => {
@@ -863,7 +882,7 @@ export default function JobMonitoringTab() {
                 <MenuItem value="">
                   <em>All</em>
                 </MenuItem>
-                {TRIGGER_OPTIONS.map((t) => (
+                {triggerOptions.map((t) => (
                   <MenuItem key={t} value={t} sx={{ fontSize: '0.75rem' }}>
                     {t}
                   </MenuItem>
@@ -1137,7 +1156,7 @@ export default function JobMonitoringTab() {
                 <MenuItem value="">
                   <em>All</em>
                 </MenuItem>
-                {TRIGGER_OPTIONS.map((t) => (
+                {triggerOptions.map((t) => (
                   <MenuItem key={t} value={t} sx={{ fontSize: '0.75rem' }}>
                     {t}
                   </MenuItem>

From 995741d1d27384ec6c831b3be066ab167f31d951 Mon Sep 17 00:00:00 2001
From: plakkara <preethi.lakkaraju@gov.bc.ca>
Date: Tue, 4 Aug 2026 18:56:49 -0400
Subject: [PATCH 2/4] modified job filter in job list table

---
 frontend/src/components/JobMonitoringTab.tsx | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/JobMonitoringTab.tsx b/frontend/src/components/JobMonitoringTab.tsx
index 71dfce7c..ae21aa4e 100644
--- a/frontend/src/components/JobMonitoringTab.tsx
+++ b/frontend/src/components/JobMonitoringTab.tsx
@@ -642,8 +642,7 @@ export default function JobMonitoringTab() {
   const filteredJobList = jobListData
     .filter((row) => {
       if (jlFilterId && !String(row.id).includes(jlFilterId)) return false
-      if (jlFilterName && !row.jobName.toLowerCase().includes(jlFilterName.toLowerCase()))
-        return false
+      if (jlFilterName && row.jobName !== jlFilterName) return false
       if (jlFilterStatus && row.status !== jlFilterStatus) return false
       if (!matchesTriggerFilter(row.triggeredBy, jlFilterTrigger)) return false
       return true
@@ -838,12 +837,26 @@ export default function JobMonitoringTab() {
               />
             )}
             {jlFilterAnchor.column === 'jobName' && (
-              <TextField
-                {...filterTextFieldProps}
+              <Select
+                size="small"
                 fullWidth
                 value={jlFilterName}
-                onChange={(e) => setJlFilterName(e.target.value)}
-              />
+                displayEmpty
+                onChange={(e) => {
+                  setJlFilterName(e.target.value)
+                  closeJlFilter()
+                }}
+                sx={{ ...filterSelectSx, minWidth: 140 }}
+              >
+                <MenuItem value="">
+                  <em>All</em>
+                </MenuItem>
+                {MONITORED_JOB_NAMES.map((n) => (
+                  <MenuItem key={n} value={n} sx={{ fontSize: '0.75rem' }}>
+                    {n}
+                  </MenuItem>
+                ))}
+              </Select>
             )}
             {jlFilterAnchor.column === 'status' && (
               <Select

From bd55542b42f3a841f83c335889e73c67efa70252 Mon Sep 17 00:00:00 2001
From: plakkara <preethi.lakkaraju@gov.bc.ca>
Date: Wed, 5 Aug 2026 10:56:53 -0400
Subject: [PATCH 3/4] created backend api to return filter values for trigger
 by

---
 backend/src/api/jobs/jobs.controller.ts       | 20 +++--
 backend/src/api/jobs/jobs.controllers.spec.ts | 14 +++
 backend/src/jobs/jobs.service.spec.ts         | 37 +++++---
 backend/src/jobs/jobs.service.ts              | 90 +++++++++++++------
 frontend/src/components/JobMonitoringTab.tsx  | 26 ++++--
 frontend/src/service/jobs-service.ts          |  5 ++
 6 files changed, 139 insertions(+), 53 deletions(-)

diff --git a/backend/src/api/jobs/jobs.controller.ts b/backend/src/api/jobs/jobs.controller.ts
index abdcd1e9..3e3c92e6 100644
--- a/backend/src/api/jobs/jobs.controller.ts
+++ b/backend/src/api/jobs/jobs.controller.ts
@@ -21,6 +21,12 @@ import { JobActivityType } from 'src/jobs/enums/job-activity-type.enum'
 import { JobStatus } from 'src/jobs/enums/job-status.enum'
 import { JobTrigger } from 'src/jobs/enums/job-trigger.enum'
 import { JobType } from 'src/jobs/enums/job-type.enum'
+import {
+  formatJobDisplayName,
+  formatJobSummary,
+  formatMonitoringStatus,
+  formatTriggeredBy,
+} from 'src/jobs/job-monitoring.utils'
 import { JobRunner } from 'src/jobs/job-runner.service'
 import {
   JobsService,
@@ -28,14 +34,8 @@ import {
   type MonitoringHistoryFilters,
 } from 'src/jobs/jobs.service'
 import { OpenshiftJobLauncher } from 'src/jobs/openshift-job-launcher.service'
-import {
-  formatJobDisplayName,
-  formatJobSummary,
-  formatMonitoringStatus,
-  formatTriggeredBy,
-} from 'src/jobs/job-monitoring.utils'
-import { CSAGuard } from '../common/guards/csa.guard'
 import { CurrentUser } from '../common/decorators/current-user.decorator'
+import { CSAGuard } from '../common/guards/csa.guard'
 import { canRunBulkJobInApiProcess } from './bulk-job-deploy-env'
 import { getJobRunWarning } from './job-openshift-advisory'
 
@@ -316,6 +316,12 @@ export class JobsController {
     }
   }
 
+  @Get('monitoring/triggered-by')
+  @ApiResponse({ status: 200, description: 'Distinct Trigger By values for monitored jobs' })
+  async getMonitoringTriggeredBy() {
+    return this.jobsService.getMonitoringTriggeredByValues()
+  }
+
   @Get('monitoring/activities')
   @ApiResponse({ status: 200, description: 'Recent monitoring activities' })
   async getRecentActivities(
diff --git a/backend/src/api/jobs/jobs.controllers.spec.ts b/backend/src/api/jobs/jobs.controllers.spec.ts
index cac72601..59a7143a 100644
--- a/backend/src/api/jobs/jobs.controllers.spec.ts
+++ b/backend/src/api/jobs/jobs.controllers.spec.ts
@@ -33,6 +33,7 @@ describe('JobsController', () => {
     getJobs: vi.fn(),
     getLatestJobsPerType: vi.fn(),
     getJobHistory: vi.fn(),
+    getMonitoringTriggeredByValues: vi.fn(),
     getRecentActivities: vi.fn(),
     getActivities: vi.fn(),
     markFailed: vi.fn(),
@@ -470,6 +471,19 @@ describe('JobsController', () => {
     })
   })
 
+  describe('GET /jobs/monitoring/triggered-by', () => {
+    it('should return distinct trigger values for monitoring filters', async () => {
+      mockJobsService.getMonitoringTriggeredByValues.mockResolvedValue(['SYSTEM', 'CGWRK22'])
+
+      const res = await request(app.getHttpServer())
+        .get('/jobs/monitoring/triggered-by')
+        .expect(200)
+
+      expect(mockJobsService.getMonitoringTriggeredByValues).toHaveBeenCalled()
+      expect(res.body).toEqual(['SYSTEM', 'CGWRK22'])
+    })
+  })
+
   describe('GET /jobs/monitoring/activities', () => {
     it('should return recent activities with pagination and filters', async () => {
       mockJobsService.getRecentActivities.mockResolvedValue({
diff --git a/backend/src/jobs/jobs.service.spec.ts b/backend/src/jobs/jobs.service.spec.ts
index 8ede2075..c2c1a2a9 100644
--- a/backend/src/jobs/jobs.service.spec.ts
+++ b/backend/src/jobs/jobs.service.spec.ts
@@ -302,18 +302,6 @@ describe('JobsService', () => {
       )
     })
 
-    it('should filter monitoring history by USER using jobTrigger', async () => {
-      await service.getJobHistory({ triggeredBy: 'USER' })
-
-      expect(prisma.jobRun.findMany).toHaveBeenCalledWith(
-        expect.objectContaining({
-          where: expect.objectContaining({
-            jobTrigger: JobTrigger.END_USER,
-          }),
-        }),
-      )
-    })
-
     it('should query history for monitored types including ICM/MIS child runs', async () => {
       await service.getJobHistory()
 
@@ -344,6 +332,31 @@ describe('JobsService', () => {
       )
     })
 
+    it('should return distinct trigger values for full monitoring scope', async () => {
+      vi.spyOn(prisma.jobRun, 'findMany').mockResolvedValue([
+        { jobTrigger: JobTrigger.CRON, triggeredByUser: null },
+        { jobTrigger: JobTrigger.END_USER, triggeredByUser: 'jsmith' },
+        { jobTrigger: JobTrigger.END_USER, triggeredByUser: 'adoe' },
+        { jobTrigger: JobTrigger.END_USER, triggeredByUser: 'JSMITH' },
+      ] as any)
+
+      const result = await service.getMonitoringTriggeredByValues()
+
+      expect(prisma.jobRun.findMany).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: expect.objectContaining({
+            startedAt: { gte: expect.any(Date) },
+          }),
+          select: {
+            jobTrigger: true,
+            triggeredByUser: true,
+          },
+          distinct: ['jobTrigger', 'triggeredByUser'],
+        }),
+      )
+      expect(result).toEqual(['SYSTEM', 'ADOE', 'JSMITH'])
+    })
+
     it('should apply recent activity time window', async () => {
       await service.getRecentActivities(1, 10)
 
diff --git a/backend/src/jobs/jobs.service.ts b/backend/src/jobs/jobs.service.ts
index 2085fed1..35fa94c0 100644
--- a/backend/src/jobs/jobs.service.ts
+++ b/backend/src/jobs/jobs.service.ts
@@ -7,6 +7,7 @@ import { JobStatus } from './enums/job-status.enum'
 import { JobTrigger } from './enums/job-trigger.enum'
 import { JobType } from './enums/job-type.enum'
 import {
+  formatTriggeredBy,
   isMonitoredChildJobType,
   MONITORED_CHILD_JOB_TYPES,
   MONITORED_JOB_HISTORY_TYPES,
@@ -49,6 +50,41 @@ export interface CreateJobDto {
 export class JobsService {
   constructor(private readonly prisma: PrismaService) {}
 
+  private getMonitoringHistoryScopeWhere(
+    filters: Pick<MonitoringHistoryFilters, 'jobType' | 'status' | 'jobId' | 'triggeredBy'> = {},
+  ): Prisma.JobRunWhereInput {
+    const oneMonthAgo = new Date()
+    oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1)
+
+    const monitoredTypes = filters.jobType ? [filters.jobType] : MONITORED_JOB_HISTORY_TYPES
+
+    const where: Prisma.JobRunWhereInput = {
+      startedAt: { gte: oneMonthAgo },
+      jobType: { in: monitoredTypes },
+      OR: [{ jobType: { in: MONITORED_CHILD_JOB_TYPES } }, { parentJobId: null }],
+      ...(filters.status && { status: filters.status }),
+      ...(filters.jobId && { id: filters.jobId }),
+    }
+
+    if (filters.triggeredBy) {
+      if (filters.triggeredBy === 'SYSTEM') {
+        where.jobTrigger = { in: [JobTrigger.CRON, JobTrigger.SYSTEM] }
+      } else if (filters.triggeredBy === JobTrigger.END_USER) {
+        where.jobTrigger = JobTrigger.END_USER
+      } else if (
+        filters.triggeredBy === JobTrigger.CRON ||
+        filters.triggeredBy === JobTrigger.SYSTEM
+      ) {
+        where.jobTrigger = filters.triggeredBy
+      } else {
+        where.jobTrigger = JobTrigger.END_USER
+        where.triggeredByUser = { equals: filters.triggeredBy, mode: 'insensitive' }
+      }
+    }
+
+    return where
+  }
+
   async createJob(dto: CreateJobDto) {
     const now = new Date()
     const job = await this.prisma.jobRun.create({
@@ -304,34 +340,7 @@ export class JobsService {
   async getJobHistory(filters: MonitoringHistoryFilters = {}) {
     const page = filters.page ?? 1
     const limit = filters.limit ?? 10
-    const oneMonthAgo = new Date()
-    oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1)
-
-    const monitoredTypes = filters.jobType ? [filters.jobType] : MONITORED_JOB_HISTORY_TYPES
-
-    const where: Prisma.JobRunWhereInput = {
-      startedAt: { gte: oneMonthAgo },
-      jobType: { in: monitoredTypes },
-      OR: [{ jobType: { in: MONITORED_CHILD_JOB_TYPES } }, { parentJobId: null }],
-      ...(filters.status && { status: filters.status }),
-      ...(filters.jobId && { id: filters.jobId }),
-    }
-
-    if (filters.triggeredBy) {
-      if (filters.triggeredBy === 'SYSTEM') {
-        where.jobTrigger = { in: [JobTrigger.CRON, JobTrigger.SYSTEM] }
-      } else if (filters.triggeredBy === 'USER' || filters.triggeredBy === JobTrigger.END_USER) {
-        where.jobTrigger = JobTrigger.END_USER
-      } else if (
-        filters.triggeredBy === JobTrigger.CRON ||
-        filters.triggeredBy === JobTrigger.SYSTEM
-      ) {
-        where.jobTrigger = filters.triggeredBy
-      } else {
-        where.jobTrigger = JobTrigger.END_USER
-        where.triggeredByUser = { equals: filters.triggeredBy, mode: 'insensitive' }
-      }
-    }
+    const where = this.getMonitoringHistoryScopeWhere(filters)
 
     const sortBy = filters.sortBy ?? 'startedAt'
     const sortOrder = filters.sortOrder ?? 'desc'
@@ -349,6 +358,31 @@ export class JobsService {
     return { data, total, page, limit }
   }
 
+  async getMonitoringTriggeredByValues(): Promise<string[]> {
+    const rows = await this.prisma.jobRun.findMany({
+      where: this.getMonitoringHistoryScopeWhere(),
+      select: {
+        jobTrigger: true,
+        triggeredByUser: true,
+      },
+      distinct: ['jobTrigger', 'triggeredByUser'],
+    })
+
+    const values = Array.from(
+      new Set(
+        rows
+          .map((row) => formatTriggeredBy(row))
+          .map((value) => value.trim().toUpperCase())
+          .filter((value) => value.length > 0),
+      ),
+    )
+
+    const sortedIdirs = values
+      .filter((value) => value !== 'SYSTEM')
+      .sort((a, b) => a.localeCompare(b))
+    return values.includes('SYSTEM') ? ['SYSTEM', ...sortedIdirs] : sortedIdirs
+  }
+
   async addActivity(
     jobRunId: number | null,
     activity: { severity: JobActivitySeverity; type: JobActivityType; related?: string },
diff --git a/frontend/src/components/JobMonitoringTab.tsx b/frontend/src/components/JobMonitoringTab.tsx
index efe11a36..0b512445 100644
--- a/frontend/src/components/JobMonitoringTab.tsx
+++ b/frontend/src/components/JobMonitoringTab.tsx
@@ -33,6 +33,7 @@ import {
   getJobActivities,
   getJobHistory,
   getLatestJobs,
+  getMonitoringTriggeredByValues,
   getRecentActivities,
   type ActivityParams,
   type JobActivityRow,
@@ -92,7 +93,6 @@ const normalizeStatus = (status: string): string => {
 
 const matchesTriggerFilter = (triggeredBy: string, filter: string): boolean => {
   if (!filter) return true
-  if (filter === 'USER') return triggeredBy !== 'SYSTEM'
   return triggeredBy.toUpperCase() === filter.toUpperCase()
 }
 
@@ -356,6 +356,7 @@ export default function JobMonitoringTab() {
     element: HTMLElement | null
     column: ActivityFilterColumn | ''
   }>({ element: null, column: '' })
+  const [triggerOptions, setTriggerOptions] = useState<string[]>([])
 
   // ── Data fetching ───────────────────────────────────────────────────────
   const fetchJobList = useCallback(async () => {
@@ -445,6 +446,15 @@ export default function JobMonitoringTab() {
     actSortOrder,
   ])
 
+  const fetchTriggerOptions = useCallback(async () => {
+    try {
+      const values = await getMonitoringTriggeredByValues()
+      setTriggerOptions(values)
+    } catch {
+      setTriggerOptions([])
+    }
+  }, [])
+
   useEffect(() => {
     const timeoutId = window.setTimeout(() => {
       void fetchJobList()
@@ -469,6 +479,10 @@ export default function JobMonitoringTab() {
     return () => window.clearTimeout(timeoutId)
   }, [fetchActivities])
 
+  useEffect(() => {
+    void fetchTriggerOptions()
+  }, [fetchTriggerOptions])
+
   const hasRunningJobs = jobListData.some((row) => row.status.toUpperCase() === 'RUNNING')
 
   useEffect(() => {
@@ -602,9 +616,7 @@ export default function JobMonitoringTab() {
     actSortField !== 'when' ||
     actSortOrder !== 'desc'
 
-  // Build trigger filter options from loaded monitoring data.
-  // Keep SYSTEM first, followed by discovered IDIRs in alphabetical order.
-  const triggerOptions = (() => {
+  const fallbackTriggerOptions = (() => {
     const found = new Set<string>()
     const add = (value: string | null | undefined) => {
       const normalized = (value || '').trim().toUpperCase()
@@ -621,6 +633,8 @@ export default function JobMonitoringTab() {
 
     return found.has('SYSTEM') ? ['SYSTEM', ...sortedIdirs] : sortedIdirs
   })()
+  const availableTriggerOptions =
+    triggerOptions.length > 0 ? triggerOptions : fallbackTriggerOptions
 
   // ── Job List: client-side filter + sort ──────────────────────────────────
   const filteredJobList = jobListData
@@ -879,7 +893,7 @@ export default function JobMonitoringTab() {
                 <MenuItem value="">
                   <em>All</em>
                 </MenuItem>
-                {triggerOptions.map((t) => (
+                {availableTriggerOptions.map((t) => (
                   <MenuItem key={t} value={t} sx={{ fontSize: '0.75rem' }}>
                     {t}
                   </MenuItem>
@@ -1153,7 +1167,7 @@ export default function JobMonitoringTab() {
                 <MenuItem value="">
                   <em>All</em>
                 </MenuItem>
-                {triggerOptions.map((t) => (
+                {availableTriggerOptions.map((t) => (
                   <MenuItem key={t} value={t} sx={{ fontSize: '0.75rem' }}>
                     {t}
                   </MenuItem>
diff --git a/frontend/src/service/jobs-service.ts b/frontend/src/service/jobs-service.ts
index a0effe1d..287810b3 100644
--- a/frontend/src/service/jobs-service.ts
+++ b/frontend/src/service/jobs-service.ts
@@ -77,6 +77,11 @@ export const getJobHistory = async (
   return response.data
 }
 
+export const getMonitoringTriggeredByValues = async (): Promise<string[]> => {
+  const response = await APIService.getAxiosInstance().get('/jobs/monitoring/triggered-by')
+  return response.data
+}
+
 /**
  * Get paginated recent monitoring activities (default Activities view)
  */

From d060abe278685e7aea43137002de2ca3367f5ec8 Mon Sep 17 00:00:00 2001
From: plakkara <preethi.lakkaraju@gov.bc.ca>
Date: Wed, 5 Aug 2026 12:03:59 -0400
Subject: [PATCH 4/4] fixed lint error

---
 frontend/src/components/JobMonitoringTab.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/JobMonitoringTab.tsx b/frontend/src/components/JobMonitoringTab.tsx
index 0b512445..e9da9de8 100644
--- a/frontend/src/components/JobMonitoringTab.tsx
+++ b/frontend/src/components/JobMonitoringTab.tsx
@@ -480,7 +480,11 @@ export default function JobMonitoringTab() {
   }, [fetchActivities])
 
   useEffect(() => {
-    void fetchTriggerOptions()
+    const timeoutId = window.setTimeout(() => {
+      void fetchTriggerOptions()
+    }, 0)
+
+    return () => window.clearTimeout(timeoutId)
   }, [fetchTriggerOptions])
 
   const hasRunningJobs = jobListData.some((row) => row.status.toUpperCase() === 'RUNNING')