Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/8260-remove-add-systems-wizard.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type: Removed
description: Removed the unused `/add-systems` config wizard page (including the AWS and Okta scanner steps); single-system creation remains at `/add-systems/manual` and bulk vendor add at `/add-systems/multiple`
pr: 8260
labels: []
27 changes: 0 additions & 27 deletions clients/admin-ui/cypress/e2e/config-wizard-plus.cy.ts

This file was deleted.

171 changes: 0 additions & 171 deletions clients/admin-ui/cypress/e2e/config-wizard.cy.ts

This file was deleted.

7 changes: 1 addition & 6 deletions clients/admin-ui/cypress/e2e/home.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ import { stubPlus } from "cypress/support/stubs";

import { RoleRegistryEnum } from "~/types/api";

const ALL_TILES = [
"View data map",
"Add systems",
"View systems",
"Review privacy requests",
];
const ALL_TILES = ["View data map", "View systems", "Review privacy requests"];

const verifyExpectedTiles = (expectedTiles: string[]) => {
expectedTiles.forEach((tile) => {
Expand Down
1 change: 0 additions & 1 deletion clients/admin-ui/cypress/e2e/nav-bar.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe("Nav Bar", () => {
.parents(".ant-menu-submenu")
.within(() => {
cy.getByTestId("System inventory-nav-link");
cy.getByTestId("Add systems-nav-link");
cy.getByTestId("Manage datasets-nav-link");
});
cy.getByTestId("Privacy requests-nav-group")
Expand Down
8 changes: 0 additions & 8 deletions clients/admin-ui/cypress/e2e/root-user-access.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ describe("Root User Access", () => {

// Root user should see all data inventory links
cy.getByTestId("System inventory-nav-link").should("be.visible");
cy.getByTestId("Add systems-nav-link").should("be.visible");
cy.getByTestId("Manage datasets-nav-link").should("be.visible");
});

Expand Down Expand Up @@ -213,13 +212,6 @@ describe("Root User Access", () => {
cy.url().should("not.include", "/login");
});

it("can navigate to Add systems page", () => {
cy.getByTestId("Data inventory-nav-group").click();
cy.getByTestId("Add systems-nav-link").click();
cy.url().should("include", "/add-systems");
cy.url().should("not.include", "/login");
});

it("can navigate to Privacy requests page", () => {
cy.getByTestId("Privacy requests-nav-group").click();
cy.getByTestId("Request manager-nav-link").click();
Expand Down
9 changes: 3 additions & 6 deletions clients/admin-ui/cypress/e2e/routes.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "cypress/support/stubs";

import {
ADD_SYSTEMS_ROUTE,
ADD_SYSTEMS_MULTIPLE_ROUTE,
DATAMAP_ROUTE,
LOCATIONS_ROUTE,
PRIVACY_NOTICES_ROUTE,
Expand Down Expand Up @@ -41,8 +41,6 @@ describe("Routes", () => {

it("admins can access many routes", () => {
cy.assumeRole(RoleRegistryEnum.OWNER);
cy.visit(ADD_SYSTEMS_ROUTE);
cy.getByTestId("add-systems");
cy.visit("/privacy-requests");
cy.getByTestId("privacy-requests");
cy.visit("/privacy-requests/configure");
Expand All @@ -66,9 +64,8 @@ describe("Routes", () => {
RoleRegistryEnum.VIEWER_AND_APPROVER,
].forEach((role) => {
cy.assumeRole(role);
// cannot access /add-systems
cy.visit(ADD_SYSTEMS_ROUTE);
cy.getByTestId("add-systems").should("not.exist");
// cannot access /add-systems/multiple
cy.visit(ADD_SYSTEMS_MULTIPLE_ROUTE);
cy.getByTestId("home-content");
// can access /privacy-requests
cy.visit("/privacy-requests");
Expand Down
5 changes: 1 addition & 4 deletions clients/admin-ui/cypress/e2e/systems.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {

import {
ADD_SYSTEMS_MANUAL_ROUTE,
ADD_SYSTEMS_ROUTE,
INTEGRATION_MANAGEMENT_ROUTE,
SYSTEM_ROUTE,
} from "~/features/common/nav/routes";
Expand Down Expand Up @@ -91,9 +90,7 @@ describe("System management page", () => {
body: { ...system, privacy_declarations: [] },
}).as("getDemoSystem");
// Fill in the describe form based on fixture data
cy.visit(ADD_SYSTEMS_ROUTE);
cy.getByTestId("manual-btn").click();
cy.url().should("contain", ADD_SYSTEMS_MANUAL_ROUTE);
cy.visit(ADD_SYSTEMS_MANUAL_ROUTE);
cy.wait("@getSystemsPaginated");
cy.getByTestId("input-name").type(system.name);
cy.getByTestId("input-description").type(system.description);
Expand Down
35 changes: 0 additions & 35 deletions clients/admin-ui/cypress/e2e/systems/plus/bulk-vendor-add.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import {
} from "cypress/support/stubs";

import {
ADD_SYSTEMS_MANUAL_ROUTE,
ADD_SYSTEMS_MULTIPLE_ROUTE,
ADD_SYSTEMS_ROUTE,
DATAMAP_ROUTE,
INDEX_ROUTE,
} from "~/features/common/nav/routes";
Expand Down Expand Up @@ -46,39 +44,6 @@ describe("Plus Bulk Vendor Add", () => {
.should("have.length.greaterThan", 0);
});

it("upgrade modal doesn't pop up if compass is enabled", () => {
cy.visit(ADD_SYSTEMS_ROUTE);
cy.getByTestId("multiple-btn").click();
cy.wait("@getSystemVendors");
cy.getByTestId("fidesTable");
});

it("upgrade modal pops up if compass isn't enabled and redirects to manual add", () => {
stubPlus(true, {
core_fides_version: "2.2.0",
fidesplus_server: "healthy",
dictionary: {
enabled: false,
service_health: null,
service_error: null,
},
tcf: {
enabled: true,
},
fidesplus_version: "",
fides_cloud: {
enabled: false,
},
});
cy.visit(ADD_SYSTEMS_ROUTE);
cy.getByTestId("multiple-btn").click();
cy.get(".ant-modal-confirm");
cy.getAntModalConfirmButtons()
.find(".ant-btn:not(.ant-btn-primary):not(.ant-btn-dangerous)")
.click();
cy.url().should("include", ADD_SYSTEMS_MANUAL_ROUTE);
});

it("can add new systems and redirects to datamap", () => {
stubDatamap();
cy.visit(ADD_SYSTEMS_MULTIPLE_ROUTE);
Expand Down
2 changes: 0 additions & 2 deletions clients/admin-ui/src/app/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { featuresSlice } from "~/features/common/features";
import { healthApi } from "~/features/common/health.slice";
import { dirtyFormsSlice } from "~/features/common/hooks/dirty-forms.slice";
import { v3Api } from "~/features/common/v3-api.slice";
import { configWizardSlice } from "~/features/config-wizard/config-wizard.slice";
import { connectionTypeSlice } from "~/features/connection-type";
import { tcfConfigSlice } from "~/features/consent-settings/tcf/tcf-config.slice";
import { discoveryDetectionSlice } from "~/features/data-discovery-and-detection/discovery-detection.slice";
Expand Down Expand Up @@ -80,7 +79,6 @@ const reducer = {
[datamapSlice.name]: datamapSlice.reducer,
[dirtyFormsSlice.name]: dirtyFormsSlice.reducer,
[authSlice.name]: authSlice.reducer,
[configWizardSlice.name]: configWizardSlice.reducer,
[connectionTypeSlice.name]: connectionTypeSlice.reducer,
[tcfConfigSlice.name]: tcfConfigSlice.reducer,
[dataSubjectsSlice.name]: dataSubjectsSlice.reducer,
Expand Down
Loading
Loading