Skip to content

Conversation

@jpople
Copy link
Contributor

@jpople jpople commented Nov 26, 2025

This reverts #6898.

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

@jpople jpople requested review from a team as code owners November 26, 2025 01:55
@jpople jpople requested review from johnewart and lucanovera and removed request for a team November 26, 2025 01:55
@vercel
Copy link

vercel bot commented Nov 26, 2025

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

Project Deployment Preview Comments Updated (UTC)
fides-plus-nightly Ready Ready Preview Comment Nov 26, 2025 1:59am
1 Skipped Deployment
Project Deployment Preview Comments Updated (UTC)
fides-privacy-center Ignored Ignored Nov 26, 2025 1:59am

@greptile-apps
Copy link
Contributor

greptile-apps bot commented Nov 26, 2025

Greptile Overview

Greptile Summary

This PR cleanly reverts PR #6898, which added support for custom fields on custom taxonomies.

What's being reverted:

  • Two database migrations that converted resource_type and field_type columns from Enums to Strings to support custom taxonomy keys
  • Frontend UI for adding custom fields to custom taxonomies, including autocomplete functionality and custom taxonomy selectors
  • API endpoint for fetching custom field locations
  • Type definitions that allowed string values in addition to enum values for field_type and resource_type

Key changes:

  • CustomFieldDefinition and CustomField models revert to strict enum types for resource_type and field_type
  • Custom field form simplified back to basic select inputs without custom taxonomy support
  • Removed custom taxonomy integration from taxonomy edit drawers
  • Updated test fixtures to use underscore-separated enum values (e.g., data_use instead of data use)

The revert is clean - no migrations depend on the removed migrations (303287c70600 and 795f46f656c0), and all related frontend/backend code has been consistently reverted.

Confidence Score: 5/5

  • This PR is safe to merge - it's a clean revert with no migration dependencies
  • This is a straightforward revert commit that cleanly removes all changes from PR Eng 1262 custom field improvements #6898. The revert is complete and consistent across all layers (database, backend models, frontend UI, tests). No other migrations depend on the removed migrations, and the migration chain remains intact. All code changes are mechanical reversions with no new logic introduced.
  • No files require special attention

Important Files Changed

File Analysis

Filename Score Overview
src/fides/api/alembic/migrations/versions/303287c70600_migrate_resource_type_from_enum_to_.py 5/5 Migration file removed - reverting the resource_type column change from String back to Enum
src/fides/api/alembic/migrations/versions/795f46f656c0_migrate_field_type_from_enum_to_string.py 5/5 Migration file removed - reverting the field_type column change from String back to Enum
src/fides/api/models/sql_models.py 5/5 Reverted resource_type and field_type columns back to EnumColumn from String in CustomFieldDefinition and CustomField models
clients/admin-ui/src/features/custom-fields/CustomFieldForm.tsx 5/5 Removed custom taxonomy support, simplified form by removing AutoComplete for taxonomy types and reverting to basic Select inputs
clients/admin-ui/src/types/api/models/CustomFieldDefinition.ts 5/5 Reverted field_type and resource_type from `AllowedTypes
clients/admin-ui/src/features/plus/plus.slice.ts 5/5 Removed custom field locations query endpoint and related RTK Query functionality

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

40 files reviewed, no comments

Edit Code Review Agent Settings | Greptile

@codecov
Copy link

codecov bot commented Nov 26, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.03%. Comparing base (0b67f6e) to head (fb7fca7).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7037   +/-   ##
=======================================
  Coverage   87.03%   87.03%           
=======================================
  Files         528      528           
  Lines       34666    34668    +2     
  Branches     4005     4005           
=======================================
+ Hits        30172    30174    +2     
  Misses       3620     3620           
  Partials      874      874           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@adamsachs adamsachs enabled auto-merge November 26, 2025 03:02
@adamsachs adamsachs added this pull request to the merge queue Nov 26, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2025
@adamsachs adamsachs added this pull request to the merge queue Nov 26, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 26, 2025
@adamsachs adamsachs added this pull request to the merge queue Nov 26, 2025
Merged via the queue into main with commit c3fc2c6 Nov 26, 2025
104 of 107 checks passed
@adamsachs adamsachs deleted the jpople/2025-11-25/revert-custom-field-changes branch November 26, 2025 11:48
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.

3 participants