Skip to content

Commit

Permalink
Merge branch 'main' into LJ-250-improved-dataset-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
galvana authored Feb 13, 2025
2 parents 39b1324 + 14858b2 commit c02b24f
Show file tree
Hide file tree
Showing 175 changed files with 1,413 additions and 736 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/cypress_e2e.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Cypress E2E Tests

on:
pull_request:
paths-ignore:
- "**.md"
push:
branches:
- "main"
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/frontend_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,32 +93,3 @@ jobs:
with:
name: cypress-videos-${{ matrix.clients }}
path: /home/runner/work/fides/fides/clients/${{ matrix.clients }}/cypress/videos/*.mp4

Clients-Cypress-Component:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x]
clients:
- "admin-ui"
defaults:
run:
working-directory: clients
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Install dependencies
run: npm install

- name: Cypress Component Tests (${{ matrix.clients }})
uses: cypress-io/github-action@v6
with:
working-directory: clients/${{ matrix.clients }}
install: false
component: true
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
- https://github.com/ethyca/fides/labels/high-risk: to indicate that a change is a "high-risk" change that could potentially lead to unanticipated regressions or degradations
- https://github.com/ethyca/fides/labels/db-migration: to indicate that a given change includes a DB migration

## [Unreleased](https://github.com/ethyca/fides/compare/2.54.0...main)
## [Unreleased](https://github.com/ethyca/fides/compare/2.55.0...main)



## [2.55.0](https://github.com/ethyca/fides/compare/2.54.0...2.55.0)

### Added
- Added editing support for categories of consent on discovered assets [#5739](https://github.com/ethyca/fides/pull/5739)
- Added a read-only consent category cell to Action Center aggregate system results table [#5737](https://github.com/ethyca/fides/pull/5737)
- Added detail trays to items in data catalog view [#5729](https://github.com/ethyca/fides/pull/5729)
- Support rendering and saving consent from custom notices in TCF Overlay [#5742](https://github.com/ethyca/fides/pull/5742)
- Added worker stats endpoint to monitor worker status and task queue length [#5725](https://github.com/ethyca/fides/pull/5725)
- New "Headless" experience type to support custom UI implementations [#5751](https://github.com/ethyca/fides/pull/5751)

### Changed
- Added frequency field to DataHubSchema integration config [#5716](https://github.com/ethyca/fides/pull/5716)
Expand All @@ -41,7 +46,9 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
- Fixed Bigquery flakey tests. [#5713](https://github.com/ethyca/fides/pull/5713)
- Fixed breadcrumb navigation issues in data catalog view [#5717](https://github.com/ethyca/fides/pull/5717)
- Fixed `window.Fides.experience` of FidesJS to be a merged version of the minimal and full experience. [#5726](https://github.com/ethyca/fides/pull/5726)
- Fixed vendor count template string on FidesJS embedded layer 2 descriptions (#5736)[https://github.com/ethyca/fides/pull/5736]
- Fixed vendor count template string on FidesJS embedded layer 2 descriptions [#5736](https://github.com/ethyca/fides/pull/5736)
- Allowing a list with a single dataset in the YAML dataset editor [#5750](https://github.com/ethyca/fides/pull/5750)
- Fixed edge case translation string issue on FidesJS embedded layer 2 (#5749)[https://github.com/ethyca/fides/pull/5749]

## [2.54.0](https://github.com/ethyca/fides/compare/2.53.0...2.54.0)

Expand Down
83 changes: 0 additions & 83 deletions clients/admin-ui/cypress/components/MainSideNav.cy.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/action-center.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import {
ACTION_CENTER_ROUTE,
INTEGRATION_MANAGEMENT_ROUTE,
} from "~/features/common/nav/v2/routes";
} from "~/features/common/nav/routes";

describe("Action center", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/auth.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubOpenIdProviders, stubUserManagement } from "cypress/support/stubs";

import { SYSTEM_ROUTE } from "~/features/common/nav/v2/routes";
import { SYSTEM_ROUTE } from "~/features/common/nav/routes";

describe("User Authentication", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/config-wizard-plus.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus } from "cypress/support/stubs";

import { ADD_SYSTEMS_ROUTE } from "~/features/common/nav/v2/routes";
import { ADD_SYSTEMS_ROUTE } from "~/features/common/nav/routes";
import { ClusterHealth } from "~/types/api";

/**
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/config-wizard.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubSystemCrud, stubTaxonomyEntities } from "cypress/support/stubs";

import { ADD_SYSTEMS_ROUTE } from "~/features/common/nav/v2/routes";
import { ADD_SYSTEMS_ROUTE } from "~/features/common/nav/routes";

describe("Config Wizard", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/consent-configuration.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import {
ADD_MULTIPLE_VENDORS_ROUTE,
CONFIGURE_CONSENT_ROUTE,
} from "~/features/common/nav/v2/routes";
} from "~/features/common/nav/routes";
import { RoleRegistryEnum } from "~/types/api";

describe("Consent configuration", () => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/consent-reporting.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus } from "cypress/support/stubs";

import { CONSENT_REPORTING_ROUTE } from "~/features/common/nav/v2/routes";
import { CONSENT_REPORTING_ROUTE } from "~/features/common/nav/routes";

describe("Consent reporting", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/consent-settings.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus } from "cypress/support/stubs";

import { GLOBAL_CONSENT_CONFIG_ROUTE } from "~/features/common/nav/v2/routes";
import { GLOBAL_CONSENT_CONFIG_ROUTE } from "~/features/common/nav/routes";

describe("Consent settings", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/custom-fields.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus, stubTaxonomyEntities } from "cypress/support/stubs";

import { CUSTOM_FIELDS_ROUTE } from "~/features/common/nav/v2/routes";
import { CUSTOM_FIELDS_ROUTE } from "~/features/common/nav/routes";
import { RoleRegistryEnum } from "~/types/api";

const TAXONOMY_SINGLE_SELECT_ID = "plu_1850be9e-fabc-424d-8224-2fc44c84605a";
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/data-catalog.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
stubTaxonomyEntities,
} from "cypress/support/stubs";

import { DATA_CATALOG_ROUTE } from "~/features/common/nav/v2/routes";
import { DATA_CATALOG_ROUTE } from "~/features/common/nav/routes";

describe("data catalog", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/datamap-report.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
stubTaxonomyEntities,
} from "cypress/support/stubs";

import { REPORTING_DATAMAP_ROUTE } from "~/features/common/nav/v2/routes";
import { REPORTING_DATAMAP_ROUTE } from "~/features/common/nav/routes";
import {
AllowedTypes,
CustomFieldDefinition,
Expand Down
1 change: 1 addition & 0 deletions clients/admin-ui/cypress/e2e/datasets.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ describe("Dataset", () => {

it("Can navigate to the datasets list view", () => {
cy.visit("/");
cy.getByTestId("Data inventory-nav-group").click();
cy.getByTestId("Manage datasets-nav-link").click();
cy.wait("@getFilteredDatasets");
cy.getByTestId("dataset-table");
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/discovery-detection.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
DATA_DETECTION_ROUTE,
DATA_DISCOVERY_ROUTE,
DETECTION_DISCOVERY_ACTIVITY_ROUTE,
} from "~/features/common/nav/v2/routes";
} from "~/features/common/nav/routes";

describe("discovery and detection", () => {
beforeEach(() => {
Expand Down
3 changes: 2 additions & 1 deletion clients/admin-ui/cypress/e2e/domains.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus } from "cypress/support/stubs";

import { DOMAIN_MANAGEMENT_ROUTE } from "~/features/common/nav/v2/routes";
import { DOMAIN_MANAGEMENT_ROUTE } from "~/features/common/nav/routes";

// Mock response for GET /api/v1/config?api_set=true
const API_SET_CONFIG = {
Expand All @@ -25,6 +25,7 @@ describe("Domains page", () => {

it("can navigate to the Domains page", () => {
cy.visit("/");
cy.getByTestId("Settings-nav-group").click();
cy.getByTestId("Domains-nav-link").click();
cy.getByTestId("management-domains");
});
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/integration-management.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { stubPlus, stubSystemCrud } from "cypress/support/stubs";

import { INTEGRATION_MANAGEMENT_ROUTE } from "~/features/common/nav/v2/routes";
import { INTEGRATION_MANAGEMENT_ROUTE } from "~/features/common/nav/routes";

describe("Integration management for data detection & discovery", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/cypress/e2e/locations-regulations.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { stubLocations, stubPlus } from "cypress/support/stubs";
import {
LOCATIONS_ROUTE,
REGULATIONS_ROUTE,
} from "~/features/common/nav/v2/routes";
} from "~/features/common/nav/routes";

const assertIsChecked = (
name: string,
Expand Down
Loading

0 comments on commit c02b24f

Please sign in to comment.