COM-977 Fix: adapt TargetGroupForm to allow removed filters (#77)

* adapt TargetGroupForm to allow removed filters * add changeset * add check for nodeFragment to make code more readable --------- Co-authored-by: Julia Wegmayr <[email protected]>
vivid-planet · Aug 26, 2024 · be70f36 · be70f36
1 parent e5dbbfa
commit be70f36
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 36 deletions.
diff --git a/.changeset/honest-buses-accept.md b/.changeset/honest-buses-accept.md
@@ -0,0 +1,5 @@
+---
+"@comet/brevo-admin": minor
+---
+
+Fix `TargetGroupForms` if no additional form fields are defined.
diff --git a/packages/admin/src/targetGroups/TargetGroupForm.gql.ts b/packages/admin/src/targetGroups/TargetGroupForm.gql.ts
@@ -1,18 +1,20 @@
 import { DocumentNode, gql } from "@apollo/client";
 
-export const targetGroupFormQuery = (targetGroupFormFragment: DocumentNode) => gql`
-    query TargetGroupForm($id: ID!) {
-        targetGroup(id: $id) {
-            id
-            title
-            updatedAt
-            brevoId
-            assignedContactsTargetGroupBrevoId
-            ...TargetGroupForm
+export const targetGroupFormQuery = (targetGroupFormFragment?: DocumentNode) => {
+    return gql`
+        query TargetGroupForm($id: ID!) {
+            targetGroup(id: $id) {
+                id
+                title
+                updatedAt
+                brevoId
+                assignedContactsTargetGroupBrevoId
+                ${targetGroupFormFragment ? "...TargetGroupForm" : ""}
+            }
         }
-    }
-    ${targetGroupFormFragment}
-`;
+        ${targetGroupFormFragment ?? ""}
+    `;
+};
 
 export const targetGroupFormCheckForChangesQuery = gql`
     query TargetGroupFormCheckForChanges($id: ID!) {
@@ -22,24 +24,28 @@ export const targetGroupFormCheckForChangesQuery = gql`
     }
 `;
 
-export const createTargetGroupMutation = (targetGroupFormFragment: DocumentNode) => gql`
-    mutation CreateTargetGroup($scope: EmailCampaignContentScopeInput!, $input: TargetGroupInput!) {
-        createTargetGroup(scope: $scope, input: $input) {
-            id
-            updatedAt
-            ...TargetGroupForm
+export const createTargetGroupMutation = (targetGroupFormFragment?: DocumentNode) => {
+    return gql`
+        mutation CreateTargetGroup($scope: EmailCampaignContentScopeInput!, $input: TargetGroupInput!) {
+            createTargetGroup(scope: $scope, input: $input) {
+                id
+                updatedAt
+                ${targetGroupFormFragment ? "...TargetGroupForm" : ""}
+            }
         }
-    }
-    ${targetGroupFormFragment}
-`;
+        ${targetGroupFormFragment ?? ""}
+    `;
+};
 
-export const updateTargetGroupMutation = (targetGroupFormFragment: DocumentNode) => gql`
-    mutation UpdateTargetGroup($id: ID!, $input: TargetGroupUpdateInput!, $lastUpdatedAt: DateTime) {
-        updateTargetGroup(id: $id, input: $input, lastUpdatedAt: $lastUpdatedAt) {
-            id
-            updatedAt
-            ...TargetGroupForm
+export const updateTargetGroupMutation = (targetGroupFormFragment?: DocumentNode) => {
+    return gql`
+        mutation UpdateTargetGroup($id: ID!, $input: TargetGroupUpdateInput!, $lastUpdatedAt: DateTime) {
+            updateTargetGroup(id: $id, input: $input, lastUpdatedAt: $lastUpdatedAt) {
+                id
+                updatedAt
+                ${targetGroupFormFragment ? "...TargetGroupForm" : ""}
+            }
         }
-    }
-    ${targetGroupFormFragment}
-`;
+        ${targetGroupFormFragment ?? ""}
+    `;
+};
diff --git a/packages/admin/src/targetGroups/TargetGroupForm.tsx b/packages/admin/src/targetGroups/TargetGroupForm.tsx
@@ -54,12 +54,15 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State,
     const mode = "edit";
     const formApiRef = useFormApiRef<EditTargetGroupFinalFormValues>();
 
-    const targetGroupFormFragment = gql`
-        fragment TargetGroupForm on TargetGroup {
-            ${nodeFragment ? "...".concat(nodeFragment?.name) : ""}
-        }
-        ${nodeFragment?.fragment ?? ""}
-    `;
+    let targetGroupFormFragment: DocumentNode | undefined;
+    if (additionalFormFields && nodeFragment) {
+        targetGroupFormFragment = gql`
+            fragment TargetGroupForm on TargetGroup {
+                ${"...".concat(nodeFragment.name)}
+            }
+            ${nodeFragment.fragment}
+        `;
+    }
 
     const { data, error, loading, refetch } = useQuery<GQLTargetGroupFormQuery, GQLTargetGroupFormQueryVariables>(
         targetGroupFormQuery(targetGroupFormFragment),