Skip to content

Commit

Permalink
Merge branch 'main' into split-query-config-files
Browse files Browse the repository at this point in the history
  • Loading branch information
galvana authored Jan 10, 2025
2 parents 53944d5 + 1de84b5 commit 82d7da7
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -40,16 +40,13 @@
"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",
"responsibility",
"retention_period",
"shared_categories",
"special_category_legal_basis",
"system_dependencies",
"third_country_safeguards",
"third_parties",
"system_undeclared_data_categories",
"data_use_undeclared_data_categories",
Expand Down
18 changes: 0 additions & 18 deletions clients/admin-ui/cypress/fixtures/datamap/datamap.json
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions clients/admin-ui/cypress/fixtures/datamap/empty_datamap.json
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
Loading

0 comments on commit 82d7da7

Please sign in to comment.