From 1de84b5837eb68474c3325abbcf59219dfea69d4 Mon Sep 17 00:00:00 2001 From: Andres Torres Date: Fri, 10 Jan 2025 08:17:38 -0600 Subject: [PATCH] HJ-352 - Fixes some fields that are not present on the CSV and they shouldn't be present on the web datamap report (#5645) Co-authored-by: Jason Gill --- .../custom-reports/custom-report.json | 5 +- .../cypress/fixtures/datamap/datamap.json | 18 ------ .../fixtures/datamap/empty_datamap.json | 2 - .../cypress/fixtures/datamap/minimal.json | 60 ------------------- .../src/features/datamap/datamap.slice.ts | 7 +-- .../datamap/reporting/DatamapReportTable.tsx | 28 +++++---- .../reporting/DatamapReportTableColumns.tsx | 24 +------- .../features/datamap/reporting/constants.tsx | 15 ++--- .../src/types/api/models/DatamapReport.ts | 3 - .../src/components/types/api/models/System.ts | 4 -- .../types/api/models/DatamapReport.ts | 3 - 11 files changed, 26 insertions(+), 143 deletions(-) diff --git a/clients/admin-ui/cypress/fixtures/custom-reports/custom-report.json b/clients/admin-ui/cypress/fixtures/custom-reports/custom-report.json index b2e2238323..9a3ae9bc4e 100644 --- a/clients/admin-ui/cypress/fixtures/custom-reports/custom-report.json +++ b/clients/admin-ui/cypress/fixtures/custom-reports/custom-report.json @@ -24,7 +24,7 @@ "legal_address", "cookie_refresh", "data_security_practices", - "DATA_SHARED_WITH_THIRD_PARTIES", + "data_shared_with_third_parties", "data_stewards", "declaration_name", "does_international_transfers", @@ -40,7 +40,6 @@ "legal_basis_for_profiling", "legal_basis_for_transfers", "legitimate_interest_disclosure_url", - "link_to_processor_contract", "processes_personal_data", "reason_for_exemption", "requires_data_protection_assessments", @@ -48,8 +47,6 @@ "retention_period", "shared_categories", "special_category_legal_basis", - "system_dependencies", - "third_country_safeguards", "third_parties", "system_undeclared_data_categories", "data_use_undeclared_data_categories", diff --git a/clients/admin-ui/cypress/fixtures/datamap/datamap.json b/clients/admin-ui/cypress/fixtures/datamap/datamap.json index fa73ee31ca..f4607dfe6d 100644 --- a/clients/admin-ui/cypress/fixtures/datamap/datamap.json +++ b/clients/admin-ui/cypress/fixtures/datamap/datamap.json @@ -6,9 +6,7 @@ "system.privacy_declaration.data_use.name": "Purpose of Processing", "system.privacy_declaration.data_subjects.name": "Categories of Individuals", "unioned_data_categories": "Categories of Personal Data (Fides Taxonomy)", - "system.link_to_processor_contract": "Link to Contract with Processor", "third_country_combined": "Third Country Transfers", - "system.third_country_safeguards": "Safeguards for Exceptional Transfers of Personal Data", "organization.link_to_security_policy": "General Description of Security Measures", "system.privacy_declaration.data_subjects.rights_available": "Rights available to individuals", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "Existence of automated decision-making, including profiling (if applicable)", @@ -24,9 +22,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.contact", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -42,9 +38,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.device.cookie_id", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -60,9 +54,7 @@ "system.privacy_declaration.data_use.name": "Advertising, Marketing or Promotion", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.device.cookie_id", - "system.link_to_processor_contract": "", "third_country_combined": "N/A", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -78,9 +70,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.contact.email", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -96,9 +86,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "system.operations", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -114,9 +102,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.unique_id", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -132,9 +118,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.contact.address.state", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", @@ -150,9 +134,7 @@ "system.privacy_declaration.data_use.name": "System", "system.privacy_declaration.data_subjects.name": "Customer", "unioned_data_categories": "user.name", - "system.link_to_processor_contract": "", "third_country_combined": "USA, GBR, CAN", - "system.third_country_safeguards": "", "organization.link_to_security_policy": "https://ethyca.com/privacy-policy/", "system.privacy_declaration.data_subjects.rights_available": "No data subject rights listed", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "N/A", diff --git a/clients/admin-ui/cypress/fixtures/datamap/empty_datamap.json b/clients/admin-ui/cypress/fixtures/datamap/empty_datamap.json index db645b12be..47ab0e62cc 100644 --- a/clients/admin-ui/cypress/fixtures/datamap/empty_datamap.json +++ b/clients/admin-ui/cypress/fixtures/datamap/empty_datamap.json @@ -6,9 +6,7 @@ "system.privacy_declaration.data_use.name": "Purpose of Processing", "system.privacy_declaration.data_subjects.name": "Categories of Individuals", "unioned_data_categories": "Categories of Personal Data (Fides Taxonomy)", - "system.link_to_processor_contract": "Link to Contract with Processor", "third_country_combined": "Third Country Transfers", - "system.third_country_safeguards": "Safeguards for Exceptional Transfers of Personal Data", "organization.link_to_security_policy": "General Description of Security Measures", "system.privacy_declaration.data_subjects.rights_available": "Rights available to individuals", "system.privacy_declaration.data_subjects.automated_decisions_or_profiling": "Existence of automated decision-making, including profiling (if applicable)", diff --git a/clients/admin-ui/cypress/fixtures/datamap/minimal.json b/clients/admin-ui/cypress/fixtures/datamap/minimal.json index 2b3c178ba5..d0eea25ece 100644 --- a/clients/admin-ui/cypress/fixtures/datamap/minimal.json +++ b/clients/admin-ui/cypress/fixtures/datamap/minimal.json @@ -33,7 +33,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -42,13 +41,11 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [ "user.contact.email", "user.device.cookie_id" ], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -88,7 +85,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -97,10 +93,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -140,7 +134,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -149,10 +142,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -192,7 +183,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -201,10 +191,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -244,7 +232,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -253,10 +240,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -296,7 +281,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -305,10 +289,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -348,7 +330,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -357,10 +338,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -400,7 +379,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -409,10 +387,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -452,7 +428,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -461,10 +436,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -504,7 +477,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -513,10 +485,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -556,7 +526,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -565,10 +534,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -608,7 +575,6 @@ "legal_basis_for_transfers": [], "legal_name": "1Agency", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://www.1agency.de/datenschutz", "processes_personal_data": true, "reason_for_exemption": null, @@ -617,10 +583,8 @@ "retention_period": null, "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1Agency", "system_undeclared_data_categories": [], - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": false, @@ -677,7 +641,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -686,9 +649,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -745,7 +706,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -754,9 +714,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -813,7 +771,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -822,9 +779,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -881,7 +836,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -890,9 +844,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -949,7 +901,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -958,9 +909,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -1017,7 +966,6 @@ "legal_basis_for_transfers": [], "legal_name": "1plusX AG", "legitimate_interest_disclosure_url": "https://www.1plusx.com/privacy-policy/", - "link_to_processor_contract": null, "privacy_policy": "https://www.1plusx.com/privacy-policy/", "processes_personal_data": true, "reason_for_exemption": null, @@ -1026,9 +974,7 @@ "retention_period": "90", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1plusX", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": true, "uses_non_cookie_access": true, @@ -1067,7 +1013,6 @@ "legal_basis_for_transfers": [], "legal_name": "1trn", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": "https://1trn.com/privacy.php", "processes_personal_data": true, "reason_for_exemption": null, @@ -1076,9 +1021,7 @@ "retention_period": null, "shared_categories": null, "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "1trn", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": false, "uses_non_cookie_access": false, @@ -1117,7 +1060,6 @@ "legal_basis_for_transfers": [], "legal_name": "", "legitimate_interest_disclosure_url": null, - "link_to_processor_contract": null, "privacy_policy": null, "processes_personal_data": true, "reason_for_exemption": null, @@ -1126,9 +1068,7 @@ "retention_period": "", "shared_categories": [], "special_category_legal_basis": null, - "system_dependencies": null, "system_name": "test", - "third_country_safeguards": null, "third_parties": null, "uses_cookies": false, "uses_non_cookie_access": false, diff --git a/clients/admin-ui/src/features/datamap/datamap.slice.ts b/clients/admin-ui/src/features/datamap/datamap.slice.ts index a383763127..72a1721c10 100644 --- a/clients/admin-ui/src/features/datamap/datamap.slice.ts +++ b/clients/admin-ui/src/features/datamap/datamap.slice.ts @@ -46,12 +46,7 @@ const DEFAULT_ACTIVE_COLUMNS = [ SYSTEM_DESCRIPTION, ]; -const DEPRECATED_COLUMNS = [ - "third_country_combined", - "system.third_country_safeguards", - "dataset.fides_key", - "system.link_to_processor_contract", -]; +const DEPRECATED_COLUMNS = ["third_country_combined", "dataset.fides_key"]; // API endpoints const datamapApi = baseApi.injectEndpoints({ diff --git a/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx b/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx index d621bb1bf0..7960003dda 100644 --- a/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx +++ b/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx @@ -173,7 +173,7 @@ export const DatamapReportTable = () => { const [ exportMinimalDatamapReport, - { isLoading: isExportingReport, isSuccess: isExportReportSuccess }, + { isLoading: isExportingReport, isError: isExportReportError }, ] = useExportMinimalDatamapReportMutation(); const { data, totalRows } = useMemo(() => { @@ -208,15 +208,17 @@ export const DatamapReportTable = () => { const columns = useMemo( () => - getDatamapReportColumns({ - onSelectRow: (row) => setSelectedSystemId(row.fides_key), - getDataUseDisplayName, - getDataCategoryDisplayName, - getDataSubjectDisplayName, - datamapReport, - customFields, - isRenaming: isRenamingColumns, - }), + datamapReport + ? getDatamapReportColumns({ + onSelectRow: (row) => setSelectedSystemId(row.fides_key), + getDataUseDisplayName, + getDataCategoryDisplayName, + getDataSubjectDisplayName, + datamapReport, + customFields, + isRenaming: isRenamingColumns, + }) + : [], [ getDataUseDisplayName, getDataSubjectDisplayName, @@ -274,7 +276,7 @@ export const DatamapReportTable = () => { }, }, }).then(() => { - if (isExportReportSuccess) { + if (!isExportReportError) { onExportReportClose(); } }); @@ -303,7 +305,7 @@ export const DatamapReportTable = () => { }); useEffect(() => { - if (groupBy && !!tableInstance) { + if (groupBy && !!tableInstance && !!datamapReport) { if (tableInstance.getState().columnOrder.length === 0) { const tableColumnIds = tableInstance.getAllColumns().map((c) => c.id); setColumnOrder(getColumnOrder(groupBy, tableColumnIds)); @@ -314,7 +316,7 @@ export const DatamapReportTable = () => { } } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [groupBy, tableInstance]); + }, [groupBy, tableInstance, datamapReport]); useEffect(() => { // changing the groupBy should wait until the data is loaded to update the grouping diff --git a/clients/admin-ui/src/features/datamap/reporting/DatamapReportTableColumns.tsx b/clients/admin-ui/src/features/datamap/reporting/DatamapReportTableColumns.tsx index b8d2ffda86..0325c26b88 100644 --- a/clients/admin-ui/src/features/datamap/reporting/DatamapReportTableColumns.tsx +++ b/clients/admin-ui/src/features/datamap/reporting/DatamapReportTableColumns.tsx @@ -241,6 +241,9 @@ export const getDatamapReportColumns = ({ columnHelper.accessor((row) => row.data_shared_with_third_parties, { id: COLUMN_IDS.DATA_SHARED_WITH_THIRD_PARTIES, }), + columnHelper.accessor((row) => row.processes_special_category_data, { + id: COLUMN_IDS.PROCESSES_SPECIAL_CATEGORY_DATA, + }), columnHelper.accessor((row) => row.data_stewards, { id: COLUMN_IDS.DATA_STEWARDS, cell: (props) => ( @@ -364,9 +367,6 @@ export const getDatamapReportColumns = ({ columnHelper.accessor((row) => row.legitimate_interest_disclosure_url, { id: COLUMN_IDS.LEGITIMATE_INTEREST_DISCLOSURE_URL, }), - columnHelper.accessor((row) => row.link_to_processor_contract, { - id: COLUMN_IDS.LINK_TO_PROCESSOR_CONTRACT, - }), columnHelper.accessor((row) => row.processes_personal_data, { id: COLUMN_IDS.PROCESSES_PERSONAL_DATA, }), @@ -414,24 +414,6 @@ export const getDatamapReportColumns = ({ columnHelper.accessor((row) => row.special_category_legal_basis, { id: COLUMN_IDS.SPECIAL_CATEGORY_LEGAL_BASIS, }), - columnHelper.accessor((row) => row.system_dependencies, { - id: COLUMN_IDS.SYSTEM_DEPENDENCIES, - cell: (props) => ( - - ), - meta: { - showHeaderMenu: !isRenaming, - width: "auto", - }, - }), - columnHelper.accessor((row) => row.third_country_safeguards, { - id: COLUMN_IDS.THIRD_COUNTRY_SAFEGUARDS, - }), columnHelper.accessor((row) => row.third_parties, { id: COLUMN_IDS.THIRD_PARTIES, }), diff --git a/clients/admin-ui/src/features/datamap/reporting/constants.tsx b/clients/admin-ui/src/features/datamap/reporting/constants.tsx index 8ab825e1f4..e471370b60 100644 --- a/clients/admin-ui/src/features/datamap/reporting/constants.tsx +++ b/clients/admin-ui/src/features/datamap/reporting/constants.tsx @@ -27,7 +27,7 @@ export enum COLUMN_IDS { LEGAL_ADDRESS = "legal_address", COOKIE_REFRESH = "cookie_refresh", DATA_SECURITY_PRACTICES = "data_security_practices", - DATA_SHARED_WITH_THIRD_PARTIES = "DATA_SHARED_WITH_THIRD_PARTIES", + DATA_SHARED_WITH_THIRD_PARTIES = "data_shared_with_third_parties", DATA_STEWARDS = "data_stewards", DECLARATION_NAME = "declaration_name", DOES_INTERNATIONAL_TRANSFERS = "does_international_transfers", @@ -43,7 +43,6 @@ export enum COLUMN_IDS { LEGAL_BASIS_FOR_PROFILING = "legal_basis_for_profiling", LEGAL_BASIS_FOR_TRANSFERS = "legal_basis_for_transfers", LEGITIMATE_INTEREST_DISCLOSURE_URL = "legitimate_interest_disclosure_url", - LINK_TO_PROCESSOR_CONTRACT = "link_to_processor_contract", PROCESSES_PERSONAL_DATA = "processes_personal_data", REASON_FOR_EXEMPTION = "reason_for_exemption", REQUIRES_DATA_PROTECTION_ASSESSMENTS = "requires_data_protection_assessments", @@ -51,8 +50,6 @@ export enum COLUMN_IDS { RETENTION_PERIOD = "retention_period", SHARED_CATEGORIES = "shared_categories", SPECIAL_CATEGORY_LEGAL_BASIS = "special_category_legal_basis", - SYSTEM_DEPENDENCIES = "system_dependencies", - THIRD_COUNTRY_SAFEGUARDS = "third_country_safeguards", THIRD_PARTIES = "third_parties", COOKIES = "cookies", USES_COOKIES = "uses_cookies", @@ -60,6 +57,7 @@ export enum COLUMN_IDS { USES_PROFILING = "uses_profiling", SYSTEM_UNDECLARED_DATA_CATEGORIES = "system_undeclared_data_categories", DATA_USE_UNDECLARED_DATA_CATEGORIES = "data_use_undeclared_data_categories", + PROCESSES_SPECIAL_CATEGORY_DATA = "processes_special_category_data", } export const DEFAULT_COLUMN_NAMES: Record = { @@ -81,7 +79,7 @@ export const DEFAULT_COLUMN_NAMES: Record = { [COLUMN_IDS.DECLARATION_NAME]: "Declaration name", [COLUMN_IDS.DOES_INTERNATIONAL_TRANSFERS]: "Does international transfers", [COLUMN_IDS.DPA_LOCATION]: "DPA location", - [COLUMN_IDS.DESTINATIONS]: "Destinations", + [COLUMN_IDS.DESTINATIONS]: "Destination", [COLUMN_IDS.EXEMPT_FROM_PRIVACY_REGULATIONS]: "Exempt from privacy regulations", [COLUMN_IDS.FEATURES]: "Features", @@ -89,13 +87,12 @@ export const DEFAULT_COLUMN_NAMES: Record = { [COLUMN_IDS.FLEXIBLE_LEGAL_BASIS_FOR_PROCESSING]: "Flexible legal basis for processing", [COLUMN_IDS.IMPACT_ASSESSMENT_LOCATION]: "Impact assessment location", - [COLUMN_IDS.SOURCES]: "Sources", + [COLUMN_IDS.SOURCES]: "Source", [COLUMN_IDS.JOINT_CONTROLLER_INFO]: "Joint controller info", [COLUMN_IDS.LEGAL_BASIS_FOR_PROFILING]: "Legal basis for profiling", [COLUMN_IDS.LEGAL_BASIS_FOR_TRANSFERS]: "Legal basis for transfers", [COLUMN_IDS.LEGITIMATE_INTEREST_DISCLOSURE_URL]: "Legitimate interest disclosure URL", - [COLUMN_IDS.LINK_TO_PROCESSOR_CONTRACT]: "Link to processor contract", [COLUMN_IDS.PROCESSES_PERSONAL_DATA]: "Processes personal data", [COLUMN_IDS.REASON_FOR_EXEMPTION]: "Reason for exemption", [COLUMN_IDS.REQUIRES_DATA_PROTECTION_ASSESSMENTS]: @@ -104,8 +101,6 @@ export const DEFAULT_COLUMN_NAMES: Record = { [COLUMN_IDS.RETENTION_PERIOD]: "Retention period", [COLUMN_IDS.SHARED_CATEGORIES]: "Shared categories", [COLUMN_IDS.SPECIAL_CATEGORY_LEGAL_BASIS]: "Special category legal basis", - [COLUMN_IDS.SYSTEM_DEPENDENCIES]: "System dependencies", - [COLUMN_IDS.THIRD_COUNTRY_SAFEGUARDS]: "Third country safeguards", [COLUMN_IDS.THIRD_PARTIES]: "Third parties", [COLUMN_IDS.SYSTEM_UNDECLARED_DATA_CATEGORIES]: "System undeclared data categories", @@ -115,4 +110,6 @@ export const DEFAULT_COLUMN_NAMES: Record = { [COLUMN_IDS.USES_COOKIES]: "Uses cookies", [COLUMN_IDS.USES_NON_COOKIE_ACCESS]: "Uses non-cookie access", [COLUMN_IDS.USES_PROFILING]: "Uses profiling", + [COLUMN_IDS.PROCESSES_SPECIAL_CATEGORY_DATA]: + "Processes special category data", }; diff --git a/clients/admin-ui/src/types/api/models/DatamapReport.ts b/clients/admin-ui/src/types/api/models/DatamapReport.ts index 5283343ba5..b3f8cffc13 100644 --- a/clients/admin-ui/src/types/api/models/DatamapReport.ts +++ b/clients/admin-ui/src/types/api/models/DatamapReport.ts @@ -33,7 +33,6 @@ export type DatamapReport = { legal_basis_for_transfers?: Array | null; legal_name?: string | null; legitimate_interest_disclosure_url?: string | null; - link_to_processor_contract?: string | null; privacy_policy?: string | null; processes_personal_data: boolean; reason_for_exemption?: string | null; @@ -42,9 +41,7 @@ export type DatamapReport = { retention_period?: string | null; shared_categories?: Array | null; special_category_legal_basis?: string | null; - system_dependencies?: string | null; system_name: string; - third_country_safeguards?: string | null; third_parties?: string | null; uses_cookies: boolean; uses_non_cookie_access: boolean; diff --git a/clients/fidesui/src/components/types/api/models/System.ts b/clients/fidesui/src/components/types/api/models/System.ts index b17d8a75b8..ebc3a86179 100644 --- a/clients/fidesui/src/components/types/api/models/System.ts +++ b/clients/fidesui/src/components/types/api/models/System.ts @@ -79,10 +79,6 @@ export type System = { * */ privacy_declarations: Array; - /** - * A list of fides keys to model dependencies. - */ - system_dependencies?: Array; /** * * The contact details information model. diff --git a/clients/privacy-center/types/api/models/DatamapReport.ts b/clients/privacy-center/types/api/models/DatamapReport.ts index 5283343ba5..b3f8cffc13 100644 --- a/clients/privacy-center/types/api/models/DatamapReport.ts +++ b/clients/privacy-center/types/api/models/DatamapReport.ts @@ -33,7 +33,6 @@ export type DatamapReport = { legal_basis_for_transfers?: Array | null; legal_name?: string | null; legitimate_interest_disclosure_url?: string | null; - link_to_processor_contract?: string | null; privacy_policy?: string | null; processes_personal_data: boolean; reason_for_exemption?: string | null; @@ -42,9 +41,7 @@ export type DatamapReport = { retention_period?: string | null; shared_categories?: Array | null; special_category_legal_basis?: string | null; - system_dependencies?: string | null; system_name: string; - third_country_safeguards?: string | null; third_parties?: string | null; uses_cookies: boolean; uses_non_cookie_access: boolean;