Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HJ-352 - Fixes some fields that are not present on the CSV and they shouldn't be present on the web datamap report #5645

Merged
merged 8 commits into from
Jan 10, 2025
Merged

HJ-352 - Fixes some fields that are not present on the CSV and they shouldn't be present on the web datamap report #5645

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
faf7206
HJ-352 - Fixes some fields that are not present on the CSV and they s…
andres-torres-marroquin Jan 6, 2025
fe0a769
QA
andres-torres-marroquin Jan 7, 2025
ac7b483
Merge branch 'main' into andres/HJ-352
andres-torres-marroquin Jan 7, 2025
77ab3b7
QA - fixes cypress tests
andres-torres-marroquin Jan 8, 2025
a625062
Merge branch 'main' into andres/HJ-352
andres-torres-marroquin Jan 8, 2025
74cf894
QA
andres-torres-marroquin Jan 8, 2025
899ec72
fix timing of column order setting
gilluminate Jan 9, 2025
2c3b8b6
Merge branch 'main' into andres/HJ-352
andres-torres-marroquin Jan 10, 2025
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
20 changes: 15 additions & 5 deletions clients/admin-ui/cypress/e2e/datamap-report.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,23 @@ describe("Data map report table", () => {

// Verify the new order
cy.getByTestId("fidesTable").within(() => {
cy.get("thead th").eq(2).should("contain.text", "Legal name");
cy.get("thead th").eq(3).should("contain.text", "Data categories");
cy.get("thead th")
.eq(2)
.should("contain.text", "Administrating department");
cy.get("thead th")
.eq(3)
.should("contain.text", "Cookie max age seconds");
});

// Reload and verify the order persists
cy.reload();
cy.getByTestId("fidesTable").within(() => {
cy.get("thead th").eq(2).should("contain.text", "Legal name");
cy.get("thead th").eq(3).should("contain.text", "Data categories");
cy.get("thead th")
.eq(2)
.should("contain.text", "Administrating department");
cy.get("thead th")
.eq(3)
.should("contain.text", "Cookie max age seconds");
});
});

Expand Down Expand Up @@ -394,7 +402,9 @@ describe("Data map report table", () => {
.click();
cy.getByTestId("fidesTable").within(() => {
// reordering applied to report
cy.get("thead th").eq(2).should("contain.text", "Legal name");
cy.get("thead th")
.eq(2)
.should("contain.text", "Administrating department");
// column visibility applied to report
cy.get("thead th").eq(4).should("not.contain.text", "Data subject");
});
Expand Down
5 changes: 1 addition & 4 deletions clients/admin-ui/cypress/fixtures/custom-reports/custom-report.json
View file
Open in desktop
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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong uppercase fixed

"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
View file
Open in desktop
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
View file
Open in desktop
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
Loading