Skip to content

fix: okta integration filtering#7226

Merged
speaker-ender merged 1 commit intomainfrom
fix/okta-integration-filtering
Jan 14, 2026
Merged

fix: okta integration filtering#7226
speaker-ender merged 1 commit intomainfrom
fix/okta-integration-filtering

Conversation

@speaker-ender
Copy link
Copy Markdown
Contributor

Ticket []

Description Of Changes

Fixes a change left out of rebase of:
#7162
from:
https://github.com/ethyca/fides/pull/7191/files#diff-27cc36de66546a6430eba8504ee786605129bbb880b9ae2b5c755129855e4ab3R44

Code Changes

  • Restored integration monitor type when okta flag is enabled
  • Restored disabled monitors page logic

Steps to Confirm

  1. Visit the activity monitor screen with the okta flag turned off and turned on
  2. Confirm that the correct monitor type filters are sent via the api
  3. Confirm that the disabled monitors page is displayed when the webMonitor, heliosV2Enabled, and oktaMonitor flags are not enabled

Pre-Merge Checklist

  • Issue requirements met
  • All CI pipelines succeeded
  • CHANGELOG.md updated
    • Add a db-migration This indicates that a change includes a database migration label to the entry if your change includes a DB migration
    • Add a high-risk This issue suggests changes that have a high-probability of breaking existing code label to the entry if your change includes a high-risk change (i.e. potential for performance impact or unexpected regression) that should be flagged
    • Updates unreleased work already in Changelog, no new entry necessary
  • UX feedback:
    • All UX related changes have been reviewed by a designer
    • No UX review needed
  • Followup issues:
    • Followup issues created
    • No followup issues
  • Database migrations:
    • Ensure that your downrev is up to date with the latest revision on main
    • Ensure that your downgrade() migration is correct and works
      • If a downgrade migration is not possible for this change, please call this out in the PR description!
    • No migrations
  • Documentation:
    • Documentation complete, PR opened in fidesdocs
    • Documentation issue created in fidesdocs
    • If there are any new client scopes created as part of the pull request, remember to update public-facing documentation that references our scope registry
    • No documentation updates required

fix: restoring disabled monitors page logic
@vercel
Copy link
Copy Markdown
Contributor

vercel bot commented Jan 14, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Review Updated (UTC)
fides-plus-nightly Ready Ready Preview, Comment Jan 14, 2026 7:44pm
1 Skipped Deployment
Project Deployment Review Updated (UTC)
fides-privacy-center Ignored Ignored Jan 14, 2026 7:44pm

@speaker-ender speaker-ender marked this pull request as ready for review January 14, 2026 19:40
@speaker-ender speaker-ender requested a review from a team as a code owner January 14, 2026 19:40
@speaker-ender speaker-ender requested review from lucanovera and removed request for a team January 14, 2026 19:40
@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps bot commented Jan 14, 2026

Greptile Summary

This PR restores Okta integration filtering support that was inadvertently lost during a rebase. PR #7191 added Okta monitor support to the action center, but PR #7162 subsequently refactored the code by extracting monitor list logic into a new MonitorList.tsx component without including the Okta changes.

Changes:

  • Added oktaMonitor feature flag extraction in MonitorList.tsx
  • Added MONITOR_TYPES.INFRASTRUCTURE to the monitor types array when Okta monitor is enabled
  • Updated the disabled monitors page condition to include oktaMonitorEnabled check
  • Removed unused NextPage import

The changes correctly mirror the functionality from PR #7191 and ensure that when the oktaMonitor feature flag is enabled, infrastructure monitors are included in the API request filters and the monitors page is displayed.

Confidence Score: 5/5

  • This PR is safe to merge with minimal risk
  • This is a simple fix that restores functionality lost during a rebase. The changes are minimal (4 lines), well-understood, and mirror changes that were already successfully merged in PR Add infrastructure monitor type to action center gated behind oktaMonitor feature flag #7191. The oktaMonitor feature flag, MONITOR_TYPES.INFRASTRUCTURE enum value, and DisabledMonitorsPage logic all exist and are correctly referenced.
  • No files require special attention

Important Files Changed

Filename Overview
clients/admin-ui/src/features/data-discovery-and-detection/action-center/MonitorList.tsx Restored Okta monitor support by adding oktaMonitor flag check and INFRASTRUCTURE monitor type filter

@speaker-ender speaker-ender added this pull request to the merge queue Jan 14, 2026
Merged via the queue into main with commit e89fee1 Jan 14, 2026
45 of 46 checks passed
@speaker-ender speaker-ender deleted the fix/okta-integration-filtering branch January 14, 2026 20:03
mfbrown pushed a commit that referenced this pull request Jan 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants