Merge branch 'main' of github.com:ethyca/fides into LA-284-Fix-Cypres…

…s-E2E-flaky-test
ethyca · Jan 27, 2025 · c050cda · c050cda
2 parents d8c4f37 + b55ebb6
commit c050cda
Show file tree

Hide file tree

Showing 29 changed files with 526 additions and 258 deletions.
diff --git a/.fides/db_dataset.yml b/.fides/db_dataset.yml
@@ -2227,6 +2227,8 @@ dataset:
       data_categories: [system]
     - name: user_assigned_data_categories
       data_categories: [system]
+    - name: data_uses
+      data_categories: [system]
   - name: fides_user_invite
     fields:
       - name: created_at

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,12 +23,20 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 
 ### Changed
 - Updated UI colors to new brand. Update logo, homepage cards. [#5668](https://github.com/ethyca/fides/pull/5668)
+- Privacy request status tags colors have been updated [#5699](https://github.com/ethyca/fides/pull/5699)
+- The privacy declarations for a system are now sorted alphabetically by name. [#5683](https://github.com/ethyca/fides/pull/5683)
+- Upgraded GPP library to `3.1.5` and added support for all available state sections (ustx, usde, usia, etc.) [#5696](https://github.com/ethyca/fides/pull/5696)
 
 ### Developer Experience
 - Migrated radio buttons and groups to Ant Design [#5681](https://github.com/ethyca/fides/pull/5681)
 
+### Added
+- Migration to add the `data_uses` column to `stagedresource` table, prereqs for Data Catalog work in Fidesplus [#5600](https://github.com/ethyca/fides/pull/5600/)
+
 ### Fixed
 - Updating mongodb connectors so it can support usernames and password with URL encoded characters [#5682](https://github.com/ethyca/fides/pull/5682)
+- After creating a new system, the url is now updated correctly to the new system edit page [#5701](https://github.com/ethyca/fides/pull/5701)
+
 
 ## [2.53.0](https://github.com/ethyca/fides/compare/2.52.0...2.53.0)
 
@@ -52,6 +60,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - Fixed column ordering issue in the Data Map report [#5649](https://github.com/ethyca/fides/pull/5649)
 - Fixed issue where the Data Map report filter dialog was missing an Accordion item label [#5649](https://github.com/ethyca/fides/pull/5649)
 - Improved database session management for long running access request tasks [#5667](https://github.com/ethyca/fides/pull/5667)
+- Ensured decode_password function properly handles plaintext but valid base64 passwords [#5698](https://github.com/ethyca/fides/pull/5698)
 
 ## [2.52.0](https://github.com/ethyca/fides/compare/2.51.2...2.52.0)
 

diff --git a/clients/admin-ui/src/features/common/RequestStatusBadge.tsx b/clients/admin-ui/src/features/common/RequestStatusBadge.tsx
@@ -1,4 +1,4 @@
-import { Badge, BadgeProps, Spinner } from "fidesui";
+import { Badge, BadgeProps } from "fidesui";
 
 import { PrivacyRequestStatus } from "~/types/api";
 
@@ -14,39 +14,39 @@ export const statusPropMap: {
     label: "Completed",
   },
   awaiting_email_send: {
-    bg: "olive.100",
+    bg: "marble.100",
     label: "Awaiting Email Send",
   },
   denied: {
-    bg: "error.100",
+    bg: "warn.100",
     label: "Denied",
   },
   canceled: {
-    bg: "white.100",
+    bg: "marble.100",
     label: "Canceled",
   },
   error: {
     bg: "error.100",
     label: "Error",
   },
   in_processing: {
-    bg: "nectar.100",
+    bg: "caution.100",
     label: "In Progress",
   },
   paused: {
-    bg: "sandstone.100",
+    bg: "marble.100",
     label: "Paused",
   },
   pending: {
-    bg: "alert.100",
+    bg: "info.100",
     label: "New",
   },
   identity_unverified: {
-    bg: "error.100",
+    bg: "marble.100",
     label: "Unverified",
   },
   requires_input: {
-    bg: "warn.100",
+    bg: "alert.100",
     label: "Requires Input",
   },
 };
@@ -72,9 +72,6 @@ const RequestStatusBadge = ({ status }: RequestBadgeProps) => (
       }}
     >
       {statusPropMap[status].label}
-      {status === PrivacyRequestStatus.IN_PROCESSING && (
-        <Spinner size="xs" color="white" ml={2} />
-      )}
     </span>
   </Badge>
 );

diff --git a/clients/admin-ui/src/features/common/RequestType.tsx b/clients/admin-ui/src/features/common/RequestType.tsx
@@ -1,4 +1,4 @@
-import { Box, Tag } from "fidesui";
+import { Badge, Box } from "fidesui";
 import { Rule } from "privacy-requests/types";
 import React from "react";
 
@@ -25,17 +25,7 @@ export const getActionTypes = (rules: Rule[]): ActionType[] =>
 const RequestType = ({ rules }: RequestTypeProps) => {
   const tags = getActionTypes(rules)
     .map((action) => capitalize(action))
-    .map((action_type) => (
-      <Tag
-        key={action_type}
-        color="white"
-        bg="primary.400"
-        fontWeight="medium"
-        fontSize="sm"
-      >
-        {action_type}
-      </Tag>
-    ));
+    .map((action_type) => <Badge key={action_type}>{action_type}</Badge>);
 
   return <Box>{tags}</Box>;
 };

diff --git a/clients/admin-ui/src/features/privacy-requests/RequestDetails.tsx b/clients/admin-ui/src/features/privacy-requests/RequestDetails.tsx
@@ -1,4 +1,4 @@
-import { Box, Divider, Flex, Heading, HStack, Tag, Text } from "fidesui";
+import { Badge, Box, Divider, Flex, Heading, HStack, Text } from "fidesui";
 
 import ClipboardButton from "~/features/common/ClipboardButton";
 import DaysLeftTag from "~/features/common/DaysLeftTag";
@@ -53,19 +53,12 @@ const RequestDetails = ({ subjectRequest }: RequestDetailsProps) => {
         <ClipboardButton copyText={id} size="small" />
       </Flex>
       {hasPlus && subjectRequest.source && (
-        <Flex>
+        <Flex alignItems="center">
           <Text mr={2} fontSize="sm" color="gray.900" fontWeight="500">
             Source:
           </Text>
           <Box>
-            <Tag
-              color="white"
-              bg="primary.400"
-              fontWeight="medium"
-              fontSize="sm"
-            >
-              {subjectRequest.source}
-            </Tag>
+            <Badge>{subjectRequest.source}</Badge>
           </Box>
         </Flex>
       )}
@@ -77,14 +70,12 @@ const RequestDetails = ({ subjectRequest }: RequestDetailsProps) => {
           <RequestType rules={policy.rules} />
         </Box>
       </Flex>
-      <Flex>
+      <Flex alignItems="center">
         <Text mr={2} fontSize="sm" color="gray.900" fontWeight="500">
           Policy key:
         </Text>
         <Box>
-          <Tag color="white" bg="primary.400" fontWeight="medium" fontSize="sm">
-            {subjectRequest.policy.key}
-          </Tag>
+          <Badge>{subjectRequest.policy.key}</Badge>
         </Box>
       </Flex>
       <Flex alignItems="center">

diff --git a/clients/admin-ui/src/features/privacy-requests/SubjectIdentities.tsx b/clients/admin-ui/src/features/privacy-requests/SubjectIdentities.tsx
@@ -1,4 +1,4 @@
-import { Divider, Flex, Heading, Tag, Text } from "fidesui";
+import { Badge, Divider, Flex, Heading, Text } from "fidesui";
 
 import { PrivacyRequestEntity } from "./types";
 
@@ -29,21 +29,14 @@ const SubjectIdentities = ({ subjectRequest }: SubjectIdentitiesProps) => {
       {Object.entries(identity)
         .filter(([, { value }]) => value !== null)
         .map(([key, { value, label }]) => (
-          <Flex key={key} alignItems="flex-start">
-            <Text mb={4} mr={2} fontSize="sm" color="gray.900" fontWeight="500">
+          <Flex key={key} alignItems="center" mb={4}>
+            <Text mr={2} fontSize="sm" color="gray.900" fontWeight="500">
               {label}:
             </Text>
             <Text color="gray.600" fontWeight="500" fontSize="sm" mr={2}>
               {value || ""}
             </Text>
-            <Tag
-              color="white"
-              bg="primary.400"
-              fontWeight="medium"
-              fontSize="sm"
-            >
-              {identityVerifiedAt ? "Verified" : "Unverified"}
-            </Tag>
+            <Badge>{identityVerifiedAt ? "Verified" : "Unverified"}</Badge>
           </Flex>
         ))}
       {customPrivacyRequestFields &&
@@ -77,14 +70,7 @@ const SubjectIdentities = ({ subjectRequest }: SubjectIdentitiesProps) => {
                       ? item.value.join(", ")
                       : item.value}
                   </Text>
-                  <Tag
-                    color="white"
-                    bg="primary.400"
-                    fontWeight="medium"
-                    fontSize="sm"
-                  >
-                    Unverified
-                  </Tag>
+                  <Badge>Unverified</Badge>
                 </Flex>
               ))}
           </>

diff --git a/clients/admin-ui/src/features/privacy-requests/cells.tsx b/clients/admin-ui/src/features/privacy-requests/cells.tsx
@@ -10,42 +10,47 @@ export const statusPropMap: {
   [key in PrivacyRequestStatus]: BadgeProps & { label: string };
 } = {
   approved: {
-    colorScheme: "green",
+    colorScheme: "success",
     label: "Approved",
   },
   complete: {
     label: "Completed",
+    colorScheme: "success",
   },
   awaiting_email_send: {
     label: "Awaiting Email Send",
+    colorScheme: "marble",
   },
   denied: {
     label: "Denied",
+    colorScheme: "warn",
   },
   canceled: {
     label: "Canceled",
+    colorScheme: "marble",
   },
   error: {
-    colorScheme: "red",
     label: "Error",
+    colorScheme: "error",
   },
   in_processing: {
-    colorScheme: "yellow",
     label: "In Progress",
+    colorScheme: "caution",
   },
   paused: {
     label: "Paused",
+    colorScheme: "marble",
   },
   pending: {
-    colorScheme: "blue",
     label: "New",
+    colorScheme: "info",
   },
   identity_unverified: {
-    colorScheme: "red",
     label: "Unverified",
+    colorScheme: "marble",
   },
   requires_input: {
-    colorScheme: "orange",
+    colorScheme: "alert",
     label: "Requires Input",
   },
 };

diff --git a/clients/admin-ui/src/features/system/hooks/useSystemFormTabs.tsx b/clients/admin-ui/src/features/system/hooks/useSystemFormTabs.tsx
@@ -12,7 +12,10 @@ import {
   useIsAnyFormDirty,
 } from "~/features/common/hooks/useIsAnyFormDirty";
 import { useSystemOrDatamapRoute } from "~/features/common/hooks/useSystemOrDatamapRoute";
-import { INTEGRATION_MANAGEMENT_ROUTE } from "~/features/common/nav/v2/routes";
+import {
+  EDIT_SYSTEM_ROUTE,
+  INTEGRATION_MANAGEMENT_ROUTE,
+} from "~/features/common/nav/v2/routes";
 import {
   DEFAULT_TOAST_PARAMS,
   errorToastParams,
@@ -146,6 +149,11 @@ const useSystemFormTabs = ({
         setShowSaveMessage(true);
       }
       dispatch(setActiveSystem(system));
+      router.push({
+        pathname: EDIT_SYSTEM_ROUTE,
+        query: { id: system.fides_key },
+      });
+
       const toastParams = {
         ...DEFAULT_TOAST_PARAMS,
         description: (

diff --git a/clients/fides-js/__tests__/lib/gpp/stub.ts b/clients/fides-js/__tests__/lib/gpp/stub.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-underscore-dangle */
 import { EventData, PingData } from "@iabgpp/cmpapi";
 
-import { makeStub } from "../../../src/lib/gpp/stub";
-import { GppCallback } from "../../../src/lib/gpp/types";
+import { makeStub } from "~/lib/gpp/stub";
+import { GppCallback } from "~/lib/gpp/types";
 
 const EXPECTED_PING_DATA = {
   gppVersion: "1.1",