From 50273e6b0e965c5a89dd44718cbd0c77a0b05121 Mon Sep 17 00:00:00 2001
From: Allison King <allison@ethyca.com>
Date: Mon, 26 Jun 2023 17:01:02 -0400
Subject: [PATCH] Transform null names to an empty string before submission
 (#3683)

---
 CHANGELOG.md                                              | 1 +
 .../privacy-declarations/PrivacyDeclarationManager.tsx    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19e52f9a13f..92eb2b74de9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@ The types of changes are:
 - Fix bug where linking an integration would not update the tab when creating a new system [#3662](https://github.com/ethyca/fides/pull/3662)
 - Fix dataset yaml not properly reflecting the dataset in the dropdown of system integrations tab [#3666](https://github.com/ethyca/fides/pull/3666)
 - Fix privacy notices not being able to be edited via the UI after the addition of the `cookies` field [#3670](https://github.com/ethyca/fides/pull/3670)
+- Add a transform in the case of `null` name fields in privacy declarations for the data use forms [#3683](https://github.com/ethyca/fides/pull/3683)
 
 ### Changed
 
diff --git a/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationManager.tsx b/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationManager.tsx
index 3a8a1318db1..5ea9760e4f2 100644
--- a/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationManager.tsx
+++ b/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationManager.tsx
@@ -78,9 +78,15 @@ const PrivacyDeclarationManager = ({
     updatedDeclarations: PrivacyDeclarationResponse[],
     isDelete?: boolean
   ) => {
+    // The API can return a null name, but cannot receive a null name,
+    // so do an additional transform here (fides#3862)
+    const transformedDeclarations = updatedDeclarations.map((d) => ({
+      ...d,
+      name: d.name ?? "",
+    }));
     const systemBodyWithDeclaration = {
       ...system,
-      privacy_declarations: updatedDeclarations,
+      privacy_declarations: transformedDeclarations,
     };
     const handleResult = (
       result: