Merge branch 'main' into PROD-1781-Remove-rounded-corners-and-accessi…

…bility-highlights-on-reporting-column-headers

CHANGELOG.md

@@ -24,12 +24,13 @@ The types of changes are:
 ### Changed
 - Updated privacy notice & experience forms to hide translation UI when user doesn't have translation feature [#4728](https://github.com/ethyca/fides/pull/4728), [#4734](https://github.com/ethyca/fides/pull/4734)
 - Custom privacy request fields now support list values [#4686](https://github.com/ethyca/fides/pull/4686)
+- Update when GPP API reports signal status: ready [#4635](https://github.com/ethyca/fides/pull/4635)
 
 ### Fixed
 - Fixed responsive issues with the buttons on the integration screen [#4729](https://github.com/ethyca/fides/pull/4729)
 - Fixed hover/focus issues with the v2 tables [#4730](https://github.com/ethyca/fides/pull/4730)
 - Disable editing of data use declaration name and type after creation [#4731](https://github.com/ethyca/fides/pull/4731)
-
+- Cleaned up table borders [#4733](https://github.com/ethyca/fides/pull/4733)
 - Initialization issues with ExperienceNotices (#4723)[https://github.com/ethyca/fides/pull/4723]
 
 ## [2.32.0](https://github.com/ethyca/fides/compare/2.31.1...2.32.0)
@@ -78,13 +79,13 @@ The types of changes are:
 - Navbar update and new properties page [#4633](https://github.com/ethyca/fides/pull/4633)
 - Access and erasure support for Oracle Responsys [#4618](https://github.com/ethyca/fides/pull/4618)
 
-### Changed
-- Update when GPP API reports signal status: ready [#4635](https://github.com/ethyca/fides/pull/4635)
-
 ### Fixed
 - Fix issue where "x" button on Fides.js components overwrites saved preferences [#4649](https://github.com/ethyca/fides/pull/4649)
 - Initialize Fides.consent with default values from experience when saved consent cookie (fides_consent) does not exist [#4665](https://github.com/ethyca/fides/pull/4665)
 
+### Changed
+- Sets GPP applicableSections to -1 when a user visits from a state that is not part of the GPP [#4727](https://github.com/ethyca/fides/pull/4727)
+
 ## [2.30.1](https://github.com/ethyca/fides/compare/2.30.0...2.30.1)
 
 ### Fixed

clients/admin-ui/src/features/common/table/v2/FidesCell.tsx

@@ -67,8 +67,9 @@ export const FidesCell = <T,>({
           (isFirstRowOfGroupedRows && hasOneSubRow)
             ? "1px"
             : "0px",
-        borderLeftWidth: "1px",
-        borderLeftColor: "gray.200",
+      }}
+      _last={{
+        borderRightWidth: 0,
       }}
       height="inherit"
       onClick={

clients/admin-ui/src/features/common/table/v2/FidesTable.tsx

@@ -147,7 +147,7 @@ const TableBody = <T,>({
     ))}
     {tableInstance.getRowModel().rows.length === 0 && emptyTableNotice && (
       <Tr>
-        <Td colSpan={100} borderLeftWidth="1px" borderRightWidth="1px">
+        <Td colSpan={100} borderRightWidth="1px">
           {emptyTableNotice}
         </Td>
       </Tr>
@@ -205,8 +205,10 @@ export const FidesTableV2 = <T,>({
     <TableContainer
       data-testid="fidesTable"
       overflowY="auto"
+      borderColor="gray.200"
       borderBottomWidth="1px"
-      borderBottomColor="gray.200"
+      borderRightWidth="1px"
+      borderLeftWidth="1px"
     >
       <Table
         variant="unstyled"
@@ -229,15 +231,12 @@ export const FidesTableV2 = <T,>({
               {headerGroup.headers.map((header) => (
                 <Th
                   key={header.id}
+                  borderColor="gray.200"
                   borderTopWidth="1px"
-                  borderTopColor="gray.200"
                   borderBottomWidth="1px"
-                  borderBottomColor="gray.200"
                   borderRightWidth="1px"
-                  borderRightColor="gray.200"
-                  _first={{
-                    borderLeftWidth: "1px",
-                    borderLeftColor: "gray.200",
+                  _last={{
+                    borderRightWidth: 0,
                   }}
                   colSpan={header.colSpan}
                   data-testid={`column-${header.id}`}

clients/fides-js/src/fides-ext-gpp.ts

@@ -191,7 +191,9 @@ export const initializeGppCmpApi = () => {
         cmpApi,
         experience,
       });
-      cmpApi.setApplicableSections(sectionsChanged.map((s) => s.id));
+      if (sectionsChanged.length) {
+        cmpApi.setApplicableSections(sectionsChanged.map((s) => s.id));
+      }
     }
   });
 

clients/fides-js/src/lib/extensions.ts

@@ -12,6 +12,7 @@ export const setupExtensions = async ({
   options: FidesOptions;
   experience: PrivacyExperience | EmptyExperience | undefined;
 }) => {
+  // TODO (PROD-1830): pre-bundle this when GPP is enabled instead of relying on experience
   if (experience?.gpp_settings?.enabled) {
     try {
       await import(`${options.fidesJsBaseUrl}/fides-ext-gpp.js`);

clients/fides-js/src/lib/gpp/us-notices.ts

@@ -83,6 +83,10 @@ export const setGppNoticesProvidedFromExperience = ({
   const gppSection = FIDES_REGION_TO_GPP_SECTION[gppRegion];
 
   if (!gppSection) {
+    if (experience?.gpp_settings?.us_approach === GPPUSApproach.STATE) {
+      cmpApi.setApplicableSections([-1]);
+      return [];
+    }
     return [];
   }
 
@@ -130,6 +134,10 @@ export const setGppOptOutsFromCookieAndExperience = ({
   const gppSection = FIDES_REGION_TO_GPP_SECTION[gppRegion];
 
   if (!gppSection) {
+    if (experience?.gpp_settings?.us_approach === GPPUSApproach.STATE) {
+      cmpApi.setApplicableSections([-1]);
+      return [];
+    }
     return [];
   }
   sectionsChanged.add(gppSection);