diff --git a/CHANGELOG.md b/CHANGELOG.md index 1620fa4a76..50fe0e4ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ The types of changes are: ## [Unreleased](https://github.com/ethyca/fides/compare/2.18.0...main) +### Changed +- Removed deprecated fields from the taxonomy editor [#3909](https://github.com/ethyca/fides/pull/3909) + ### Fixed - Fixed issue when generating masked values for invalid data paths (#3906)[https://github.com/ethyca/fides/pull/3906] @@ -26,17 +29,14 @@ The types of changes are: - Additional consent reporting calls from `fides-js` [#3845](https://github.com/ethyca/fides/pull/3845) - Additional consent reporting calls from privacy center [#3847](https://github.com/ethyca/fides/pull/3847) - Access support for Recurly [#3595](https://github.com/ethyca/fides/pull/3595) +- HTTP Logging for the Privacy Center [#3783](https://github.com/ethyca/fides/pull/3783) +- UI support for OAuth2 authorization flow [#3819](https://github.com/ethyca/fides/pull/3819) +- Changes in the `data` directory now trigger a server reload (for local development) [#3874](https://github.com/ethyca/fides/pull/3874) ### Fixed - Fix datamap zoom for low system counts [#3835](https://github.com/ethyca/fides/pull/3835) - Fixed connector forms with external dataset reference fields [#3873](https://github.com/ethyca/fides/pull/3873) -### Added - -- HTTP Logging for the Privacy Center [#3783](https://github.com/ethyca/fides/pull/3783) -- UI support for OAuth2 authorization flow [#3819](https://github.com/ethyca/fides/pull/3819) -- Changes in the `data` directory now trigger a server reload (for local development) [#3874](https://github.com/ethyca/fides/pull/3874) - ### Changed - Simplified the file structure for HTML DSR packages [#3848](https://github.com/ethyca/fides/pull/3848) diff --git a/clients/admin-ui/cypress/e2e/taxonomy.cy.ts b/clients/admin-ui/cypress/e2e/taxonomy.cy.ts index c82df7541e..159d415460 100644 --- a/clients/admin-ui/cypress/e2e/taxonomy.cy.ts +++ b/clients/admin-ui/cypress/e2e/taxonomy.cy.ts @@ -170,7 +170,12 @@ describe("Taxonomy management page", () => { ); }); - it("Can render an extended form for Data Uses", () => { + /* + * These fields are deprecated. + * This test is being kept so it can be updated + * with new fields in the future + */ + it.skip("Can render an extended form for Data Uses", () => { cy.getByTestId("tab-Data Uses").click(); // check an entity that has optional fields filled in ("provides") diff --git a/clients/admin-ui/src/features/taxonomy/hooks.tsx b/clients/admin-ui/src/features/taxonomy/hooks.tsx index 9ffc170418..616f7157ef 100644 --- a/clients/admin-ui/src/features/taxonomy/hooks.tsx +++ b/clients/admin-ui/src/features/taxonomy/hooks.tsx @@ -12,18 +12,11 @@ import { DataSubjectRightsEnum, DataUse, IncludeExcludeEnum, - LegalBasisEnum, ResourceTypes, - SpecialCategoriesEnum, } from "~/types/api"; import { YesNoOptions } from "../common/constants"; -import { - CustomCreatableSelect, - CustomRadioGroup, - CustomSelect, - CustomTextInput, -} from "../common/form/inputs"; +import { CustomRadioGroup, CustomSelect } from "../common/form/inputs"; import { enumToOptions } from "../common/helpers"; import { useCreateDataSubjectMutation, @@ -221,12 +214,6 @@ export const useDataUse = (): TaxonomyHookData => { name: "Data use name", description: "Data use description", parent_key: "Parent data use", - legal_basis: "Legal basis", - special_category: "Special category", - recipient: "Recipient", - legitimate_interest: "Legitimate interest", - legitimate_interest_impact_assessment: - "Legitimate interest impact assessment", }; const [createDataUseMutationTrigger] = useCreateDataUseMutation(); @@ -235,23 +222,6 @@ export const useDataUse = (): TaxonomyHookData => { const transformFormValuesToEntity = (formValues: DataUse) => ({ ...formValues, - // text inputs don't like having undefined, so we originally converted - // to "", but on submission we need to convert back to undefined - legitimate_interest_impact_assessment: - formValues.legitimate_interest_impact_assessment === "" - ? undefined - : formValues.legitimate_interest_impact_assessment, - legitimate_interest: !!( - formValues.legitimate_interest?.toString() === "true" - ), - legal_basis: - formValues.legal_basis?.toString() === "" - ? undefined - : formValues.legal_basis, - special_category: - formValues.special_category?.toString() === "" - ? undefined - : formValues.special_category, }); const customFields = useCustomFields({ @@ -300,15 +270,6 @@ export const useDataUse = (): TaxonomyHookData => { ); return { ...base, - legal_basis: du.legal_basis, - special_category: du.special_category, - recipients: du.recipients ?? [], - legitimate_interest: - du.legitimate_interest == null - ? "false" - : du.legitimate_interest.toString(), - legitimate_interest_impact_assessment: - du.legitimate_interest_impact_assessment ?? "", }; }; @@ -330,47 +291,11 @@ export const useDataUse = (): TaxonomyHookData => { return result; }; - const legalBases = enumToOptions(LegalBasisEnum); - const specialCategories = enumToOptions(SpecialCategoriesEnum); - const renderExtraFormFields = (formValues: DataUse) => ( - <> - - - - - {formValues.legitimate_interest?.toString() === "true" ? ( - - ) : null} - - + ); return {