Merge branch 'main' into johnewart/python3.13

Author: galvana

.fides/db_dataset.yml

@@ -1538,6 +1538,16 @@ dataset:
       data_categories: [system.operations]
     - name: dismissable
       data_categories: [system.operations]
+    - name: gpc_description
+      data_categories: [system.operations]
+    - name: gpc_label
+      data_categories: [system.operations]
+    - name: gpc_status_applied_label
+      data_categories: [system.operations]
+    - name: gpc_status_overridden_label
+      data_categories: [system.operations]
+    - name: gpc_title
+      data_categories: [system.operations]
     - name: show_layer1_notices
       data_categories: [ system.operations ]
     - name: layer1_button_options
@@ -2404,6 +2414,16 @@ dataset:
       data_categories: [system.operations]
     - name: experience_config_id
       data_categories: [system.operations]
+    - name: gpc_description
+      data_categories: [system.operations]
+    - name: gpc_label
+      data_categories: [system.operations]
+    - name: gpc_status_applied_label
+      data_categories: [system.operations]
+    - name: gpc_status_overridden_label
+      data_categories: [system.operations]
+    - name: gpc_title
+      data_categories: [system.operations]
     - name: id
       data_categories: [system.operations]
     - name: is_default

CHANGELOG.md

@@ -23,15 +23,31 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 
 ### Added
 - Supports multi-select for the data explorer in the Action Center [#7093](https://github.com/ethyca/fides/pull/7093)
+- Support for preserving customer field changes to SaaS datasets [#7002](https://github.com/ethyca/fides/pull/7002)
+- Added location filter to new request manager screen [#7132](https://github.com/ethyca/fides/pull/7132)
+- Added handling for "page-level" errors [#7144](https://github.com/ethyca/fides/pull/7144)
+- Added sorting to new request manager screen [#7138](https://github.com/ethyca/fides/pull/7138)
+
 
 ### Changed
 - Bulk privacy request actions now accept filter sets as well as lists, enables select all functionality. [#7027](https://github.com/ethyca/fides/pull/7027)
+- Improvements to the UI/UX of the new request manager screen [#7128](https://github.com/ethyca/fides/pull/7128)
+- Increasing default async DB pool size to 50 pooled connections and 50 overflow connections [#7126](https://github.com/ethyca/fides/pull/7126)
+- Track active taxonomy in URL in taxonomy screen [#7113](https://github.com/ethyca/fides/pull/7113)
+- Updated status labels for the Action Center [#7098](https://github.com/ethyca/fides/pull/7098)
+- Extending read-only DB configuration [#7139](https://github.com/ethyca/fides/pull/7139)
 
 ### Developer Experience
 - Migrated consent settings tables to Ant Design [#7084](https://github.com/ethyca/fides/pull/7084)
+- Migrated privacy notices table to Ant Design [#7087](https://github.com/ethyca/fides/pull/7087)
+- Update Ant modal hook usage [#7086](https://github.com/ethyca/fides/pull/7086)
+- Added reusable animation components to FidesUI [#7125](https://github.com/ethyca/fides/pull/7125)
 
 ### Fixed
 - Fixed layout issues in Action Center and Monitor Configuration UI [#7092](https://github.com/ethyca/fides/pull/7092)
+- Fixed incorrect date format string [#7143](https://github.com/ethyca/fides/pull/7143)
+- Fixed dsr error toast staying while navigating [#7149](https://github.com/ethyca/fides/pull/7149)
+- Fixed repeatedly clicking "Delete" on custom fields causing multiple errors [#7115](https://github.com/ethyca/fides/pull/7115)
 
 
 ## [2.76.1](https://github.com/ethyca/fides/compare/2.76.0..2.76.1)
@@ -40,6 +56,9 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - Added options to use privacy request fields as manual task conditions [#7089](https://github.com/ethyca/fides/pull/7089)
 - Added new indexes on privacy requests and provided identities to speed up duplicate detection. [#7095](https://github.com/ethyca/fides/pull/7095) https://github.com/ethyca/fides/labels/db-migration
 
+### Security
+- Upgraded NextJS and React dependencies in Privacy Center to fix new vulnerabilities [#7112](https://github.com/ethyca/fides/pull/7112)
+
 
 ## [2.76.0](https://github.com/ethyca/fides/compare/2.75.2..2.76.0)
 

clients/.cursor/rules/frontend.mdc

@@ -28,7 +28,7 @@ Follow these rules when you write code:
 - Generally prefer TS `interface` over `type` when it makes sense to do so.
 - Avoid `any` types and `@ts-expect-error`, especially when it's related to the current task. Suggest ways to get the typing correct instead.
 - Never omit curly braces around blocks.
-- Only use tailwindcss for layout classes, no colors, fonts, borders, etc.
+- Only use tailwindcss for layout and animation classes, no colors, fonts, borders, etc.
 - FidesDebugger is a global that never needs to be imported; It should never be used for error handling.
 - Any time we import an Ant component with prefix "Ant" we should import "as" the suffix: For example "AntSelect as Select".
 - Titles, heading text, and buttons in the HTML/JSX should be sentence-cased, not title-cased.

clients/admin-ui/cypress/e2e/action-center/aggregate-results.cy.ts

@@ -69,7 +69,7 @@ describe("Action center", () => {
           .find(".ant-list-item-meta-description")
           .should(
             "have.text",
-            "216 Unlabeled, 22 Classifying, 13 In review, 2 Removals",
+            "216 Unlabeled, 22 Classifying, 13 Classified, 2 Removals",
           );
         // date tooltip
         cy.getByTestId(`monitor-result-${results[0].key}`).within(() => {

clients/admin-ui/cypress/e2e/config-wizard.cy.ts

@@ -100,6 +100,7 @@ describe("Config Wizard", () => {
     beforeEach(() => {
       stubSystemCrud();
       stubTaxonomyEntities();
+      cy.overrideFeatureFlag("oktaMonitor", false);
 
       cy.visit(ADD_SYSTEMS_ROUTE);
       // Select Okta to move to form step.

clients/admin-ui/cypress/e2e/custom-fields.cy.ts

@@ -1,3 +1,4 @@
+import { getByRole } from "@testing-library/dom";
 import { stubCustomFields, stubPlus } from "cypress/support/stubs";
 
 import { RoleRegistryEnum } from "~/types/api";
@@ -169,7 +170,9 @@ describe("Custom Fields V2", () => {
       cy.contains("Are you sure you want to delete").should("be.visible");
 
       // Confirm deletion
-      cy.getByTestId("continue-btn").click();
+      cy.get(".ant-modal-confirm-btns").within(() => {
+        cy.contains("Delete").click();
+      });
       cy.wait("@deleteCustomFieldDefinition")
         .its("response.statusCode")
         .should("eq", 204);

clients/admin-ui/cypress/e2e/data-catalog.cy.ts

@@ -92,10 +92,10 @@ describe("data catalog", () => {
       ).should("contain", "Classifying");
       cy.getByTestId(
         "row-bigquery_monitor.prj-bigquery-333333-col-status",
-      ).should("contain", "In review");
+      ).should("contain", "Classified");
       cy.getByTestId(
         "row-bigquery_monitor.prj-bigquery-444444-col-status",
-      ).should("contain", "Approved");
+      ).should("contain", "Reviewed");
     });
 
     it("should navigate to dataset view on click", () => {

clients/admin-ui/cypress/e2e/privacy-notices.cy.ts

@@ -105,11 +105,11 @@ describe("Privacy notices", () => {
       cy.get("tbody > tr").first().should("contain", "Functional");
     });
 
-    it("can click a row to go to the notice page", () => {
+    it("can click a link to go to the notice page", () => {
       cy.intercept("GET", "/api/v1/privacy-notice/pri*", {
         fixture: "privacy-notices/notice.json",
       }).as("getNoticeDetail");
-      cy.get("table").contains("td", "Essential").click();
+      cy.getByTestId("notice-name").contains("Essential").click();
       cy.wait("@getNoticeDetail");
       cy.getByTestId("privacy-notice-detail-page");
       cy.url().should("contain", ESSENTIAL_NOTICE_ID);
@@ -201,24 +201,6 @@ describe("Privacy notices", () => {
             cy.getByTestId("status-badge").contains("inactive");
           });
       });
-
-      it("can show an error if disable toggle fails", () => {
-        cy.intercept("PATCH", "/api/v1/privacy-notice/*/limited_update*", {
-          statusCode: 422,
-          body: {
-            detail:
-              "Privacy Notice 'Analytics test' has already assigned notice key 'analytics' to region 'PrivacyNoticeRegion.ie'",
-          },
-        }).as("patchNoticesError");
-        cy.get("table")
-          .contains("tr", "Data Sales")
-          .within(() => {
-            cy.get('[data-testid="toggle-switch"]').click();
-          });
-        cy.wait("@patchNoticesError").then(() => {
-          cy.getByTestId("toast-error-msg");
-        });
-      });
     });
   });
 

clients/admin-ui/cypress/e2e/taxonomies-plus.cy.ts

@@ -128,10 +128,6 @@ describe("Taxonomy management with Plus features", () => {
 
   describe("System groups", () => {
     describe("With Plus enabled", () => {
-      beforeEach(() => {
-        cy.visit("/taxonomy");
-      });
-
       it("Shows system groups as a taxonomy option", () => {
         cy.getByTestId("taxonomy-type-selector").click();
 
@@ -142,11 +138,12 @@ describe("Taxonomy management with Plus features", () => {
         cy.contains("Data subjects").should("exist");
       });
 
-      it("Can navigate to system groups taxonomy", () => {
+      it("Can navigate to system groups taxonomy by clicking on the taxonomy type selector", () => {
         cy.getByTestId("taxonomy-type-selector").selectAntMenuOption(
           "System groups",
         );
         cy.wait("@getSystemGroups");
+        cy.url().should("include", "system_group");
 
         // Should show system groups root with proper label
         cy.getByTestId("taxonomy-node-root")
@@ -159,24 +156,32 @@ describe("Taxonomy management with Plus features", () => {
         cy.contains("Red Group").should("exist");
       });
 
-      it("Displays human-readable root node label", () => {
-        cy.getByTestId("taxonomy-type-selector").selectAntMenuOption(
-          "System groups",
-        );
+      it("Can navigate to system groups taxonomy directly via URL", () => {
+        cy.visit("/taxonomy/system_group");
         cy.wait("@getSystemGroups");
 
-        // Root node should show "System groups" not "system_group"
-        cy.getByTestId("taxonomy-node-root").should("contain", "System groups");
+        // Should show system groups root with proper label
+        cy.getByTestId("taxonomy-node-root")
+          .should("contain", "System groups")
+          .should("not.contain", "system_group");
       });
 
-      it("Can interact with system group nodes", () => {
-        cy.getByTestId("taxonomy-type-selector").selectAntMenuOption(
-          "System groups",
-        );
-        cy.wait("@getSystemGroups");
-
-        // Should be able to click on system group nodes
-        cy.getByTestId("taxonomy-node-blue_group").should("exist").click();
+      describe("System group nodes", () => {
+        beforeEach(() => {
+          cy.visit("/taxonomy/system_group");
+          cy.wait("@getSystemGroups");
+        });
+
+        it("Displays human-readable root node label", () => {
+          cy.getByTestId("taxonomy-node-root").should(
+            "contain",
+            "System groups",
+          );
+        });
+
+        it("Can interact with system group nodes", () => {
+          cy.getByTestId("taxonomy-node-blue_group").should("exist").click();
+        });
       });
     });
   });