From 29d2894d5aaa433356ecd7d615cc7bf705dd1b32 Mon Sep 17 00:00:00 2001
From: Lucano Vera <lucanovera@ethyca.com>
Date: Thu, 27 Jun 2024 11:09:56 -0300
Subject: [PATCH 1/4] PROD-1950 Display all custom fields on privacy request
 form

---
 .../privacy-requests/SubmitPrivacyRequest.tsx |  6 +++++-
 .../SubmitPrivacyRequestForm.tsx              | 20 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx b/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx
index d5bb8e8bdfa..495c2ecb8a5 100644
--- a/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx
+++ b/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx
@@ -67,7 +67,11 @@ const SubmitPrivacyRequestModal = ({
   return (
     <Modal isOpen={isOpen} onClose={onClose} size="2xl" isCentered>
       <ModalOverlay />
-      <ModalContent data-testid="submit-request-modal">
+      <ModalContent
+        data-testid="submit-request-modal"
+        maxHeight="80%"
+        overflowY="auto"
+      >
         <ModalHeader>Create privacy request</ModalHeader>
         <ModalBody>
           <Stack spacing={4}>
diff --git a/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequestForm.tsx b/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequestForm.tsx
index 2ffb2970a36..53b05edc8a7 100644
--- a/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequestForm.tsx
+++ b/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequestForm.tsx
@@ -73,17 +73,15 @@ const CustomFields = ({
   const allInputs = Object.entries(customFieldInputs);
   return (
     <>
-      {allInputs.map(([fieldName, fieldInfo]) =>
-        !fieldInfo.hidden ? (
-          <CustomTextInput
-            name={`custom_privacy_request_fields.${fieldName}.value`}
-            key={fieldName}
-            label={fieldInfo.label}
-            isRequired={fieldInfo.required}
-            variant="stacked"
-          />
-        ) : null
-      )}
+      {allInputs.map(([fieldName, fieldInfo]) => (
+        <CustomTextInput
+          name={`custom_privacy_request_fields.${fieldName}.value`}
+          key={fieldName}
+          label={fieldInfo.label}
+          isRequired={fieldInfo.required}
+          variant="stacked"
+        />
+      ))}
     </>
   );
 };

From 6443c699cd342222649ce007fe6d4b79e86cb4e7 Mon Sep 17 00:00:00 2001
From: Lucano Vera <lucanovera@ethyca.com>
Date: Mon, 1 Jul 2024 17:05:35 -0300
Subject: [PATCH 2/4] PROD-1950 Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 809d2d046cf..0704ea48ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@ The types of changes are:
 - Replaces typescript-cookie with js-cookie [#5022](https://github.com/ethyca/fides/pull/5022)
 - Updated pymongo version to 4.7.3 [#5019](https://github.com/ethyca/fides/pull/5019)
 - Upgraded Datamap instance of `react-table` to v8 [#5024](https://github.com/ethyca/fides/pull/5024)
+- Updated create privacy request modal from admin-ui to include all custom fields  [#5029](https://github.com/ethyca/fides/pull/5029)
+
 
 ### Fixed
 - Fixed intermittent connection issues with Redshift by increasing timeout and preferring SSL in test connections [#4981](https://github.com/ethyca/fides/pull/4981)

From e9fc2aa2fd1d12f065422c87863f6272e9b4597f Mon Sep 17 00:00:00 2001
From: Lucano Vera <lucanovera@ethyca.com>
Date: Mon, 1 Jul 2024 17:08:40 -0300
Subject: [PATCH 3/4] PROD-1950 Update tests

---
 clients/admin-ui/cypress/e2e/privacy-requests.cy.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts b/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
index 4f532731ec7..22e6a48971a 100644
--- a/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
+++ b/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
@@ -206,7 +206,7 @@ describe("Privacy Requests", () => {
       });
     });
 
-    describe("submitting a request", () => {
+    describe.only("submitting a request", () => {
       beforeEach(() => {
         stubPlus(true);
         cy.visit("/privacy-requests");
@@ -230,7 +230,7 @@ describe("Privacy Requests", () => {
         ).should("exist");
         cy.getByTestId(
           "input-custom_privacy_request_fields.hidden_field.value"
-        ).should("not.exist");
+        ).should("exist");
         cy.getByTestId(
           "input-custom_privacy_request_fields.field_with_default_value.value"
         ).should("have.value", "The default value");
@@ -245,6 +245,9 @@ describe("Privacy Requests", () => {
         cy.getByTestId(
           "input-custom_privacy_request_fields.required_field.value"
         ).type("A value for the required field");
+        cy.getByTestId(
+          "input-custom_privacy_request_fields.hidden_field.value"
+        ).type("A value for the hidden but required field");
         cy.getByTestId("input-is_verified").click();
         cy.intercept("POST", "/api/v1/privacy-request/authenticated", {
           statusCode: 200,

From aa649be6dad2ccef6ae2a1cd65d783ade0f1b5e7 Mon Sep 17 00:00:00 2001
From: Lucano Vera <lucanovera@ethyca.com>
Date: Mon, 1 Jul 2024 17:15:53 -0300
Subject: [PATCH 4/4] PROD-1950 remove accidental .only() on test

---
 clients/admin-ui/cypress/e2e/privacy-requests.cy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts b/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
index 22e6a48971a..1b6ca2ce7f4 100644
--- a/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
+++ b/clients/admin-ui/cypress/e2e/privacy-requests.cy.ts
@@ -206,7 +206,7 @@ describe("Privacy Requests", () => {
       });
     });
 
-    describe.only("submitting a request", () => {
+    describe("submitting a request", () => {
       beforeEach(() => {
         stubPlus(true);
         cy.visit("/privacy-requests");