Update D&D integration form behavior (#5023)

CHANGELOG.md

@@ -27,6 +27,7 @@ The types of changes are:
 
 ### Changed
 - Changed discovery monitor form behavior around execution date/time selection [#5017](https://github.com/ethyca/fides/pull/5017)
+- Changed integration form behavior when errors occur [#5023](https://github.com/ethyca/fides/pull/5023)
 
 ### Fixed
 - Fixed intermittent connection issues with Redshift by increasing timeout and preferring SSL in test connections [#4981](https://github.com/ethyca/fides/pull/4981)

clients/admin-ui/cypress/e2e/integration-management.cy.ts

@@ -96,7 +96,9 @@ describe("Integration management for data detection & discovery", () => {
       });
 
       it("should be able to add a new integration with secrets", () => {
-        cy.intercept("PATCH", "/api/v1/connection").as("patchConnection");
+        cy.intercept("PATCH", "/api/v1/connection", { statusCode: 200 }).as(
+          "patchConnection"
+        );
         cy.intercept("PUT", "/api/v1/connection/*/secret*").as(
           "putConnectionSecrets"
         );

clients/admin-ui/src/features/integrations/add-integration/ConfigureIntegrationForm.tsx

@@ -110,37 +110,38 @@ const ConfigureIntegrationForm = ({
         } this integration. Please try again.`
       );
       toast({ status: "error", description: patchErrorMsg });
-    } else {
+      return;
+    }
+    if (!values.secrets) {
       toast({
         status: "success",
         description: `Integration ${
           isEditing ? "updated" : "created"
         } successfully`,
       });
+      return;
     }
     // if provided, update secrets with separate request
-    if (values.secrets) {
-      const secretsResult = await updateConnectionSecretsMutationTrigger({
-        connection_key: connectionPayload.key,
-        secrets: values.secrets,
-      });
-      if (isErrorResult(secretsResult)) {
-        const secretsErrorMsg = getErrorMessage(
-          secretsResult.error,
-          `An error occurred while ${
-            isEditing ? "updating" : "creating"
-          } this integration secret.  Please try again.`
-        );
-        toast({ status: "error", description: secretsErrorMsg });
-      } else {
-        toast({
-          status: "success",
-          description: `Integration secret ${
-            isEditing ? "updated" : "created"
-          } successfully`,
-        });
-      }
+    const secretsResult = await updateConnectionSecretsMutationTrigger({
+      connection_key: connectionPayload.key,
+      secrets: values.secrets,
+    });
+    if (isErrorResult(secretsResult)) {
+      const secretsErrorMsg = getErrorMessage(
+        secretsResult.error,
+        `An error occurred while ${
+          isEditing ? "updating" : "creating"
+        } this integration's secret.  Please try again.`
+      );
+      toast({ status: "error", description: secretsErrorMsg });
+      return;
     }
+    toast({
+      status: "success",
+      description: `Integration secret ${
+        isEditing ? "updated" : "created"
+      } successfully`,
+    });
     onCancel();
   };
 

clients/admin-ui/src/features/system/system.slice.ts

@@ -5,6 +5,7 @@ import { baseApi } from "~/features/common/api.slice";
 import {
   BulkPutConnectionConfiguration,
   ConnectionConfigurationResponse,
+  CreateConnectionConfigurationWithSecrets,
   System,
   SystemResponse,
   TestStatusMessage,
@@ -114,7 +115,7 @@ const systemApi = baseApi.injectEndpoints({
       {
         systemFidesKey: string;
         connectionConfigs: Omit<
-          ConnectionConfigurationResponse,
+          CreateConnectionConfigurationWithSecrets,
           "created_at"
         >[];
       }