Merge pull request #1281 from brave/master

Production Release 2024-07-30

src/components/Creatives/CreativeStatusSwitch.tsx

@@ -20,14 +20,22 @@ import {
   AdvertiserCreativesDocument,
   CampaignsForCreativeDocument,
   CreativeFragment,
-  UpdateCreativeDocument,
 } from "@/graphql-client/graphql";
 import { useLazyQuery, useMutation } from "@apollo/client";
+import { graphql } from "@/graphql-client/index";
 
 interface Props {
   creative: CreativeFragment;
 }
 
+const Creative_State_Update = graphql(`
+  mutation AdsManagerUpdateCreativeState($id: String!, $state: String!) {
+    adsManagerUpdateCreativeState(id: $id, state: $state) {
+      id
+    }
+  }
+`);
+
 type RelatedCampaign = { id: string; name: string; state: string };
 export function CreativeStatusSwitch({ creative }: Props) {
   const { advertiser } = useAdvertiser();
@@ -41,20 +49,13 @@ export function CreativeStatusSwitch({ creative }: Props) {
   );
   const [creativeState, setCreativeState] = useState(input.state);
   const [update, { loading: updateLoading }] = useMutation(
-    UpdateCreativeDocument,
+    Creative_State_Update,
     {
       refetchQueries: [
         {
           query: AdvertiserCreativesDocument,
           variables: { advertiserId: advertiser.id },
         },
-        {
-          query: CampaignsForCreativeDocument,
-          variables: {
-            creativeId: creative.id,
-            advertiserId: advertiser.id,
-          },
-        },
       ],
       onCompleted() {
         setRelatedCampaigns([]);
@@ -86,7 +87,7 @@ export function CreativeStatusSwitch({ creative }: Props) {
                 update({
                   variables: {
                     id: creative.id,
-                    input: { ...input, state: theState },
+                    state: theState,
                   },
                 });
               }
@@ -137,7 +138,7 @@ export function CreativeStatusSwitch({ creative }: Props) {
               update({
                 variables: {
                   id: creative.id,
-                  input: { ...input, state: creativeState },
+                  state: creativeState,
                 },
               });
             }}

src/components/Creatives/hooks/useSubmitCreative.tsx

@@ -2,7 +2,6 @@ import { useCallback } from "react";
 import {
   AdvertiserCreativesDocument,
   CreateCreativeDocument,
-  UpdateCreativeDocument,
 } from "@/graphql-client/graphql";
 import { useAdvertiser } from "@/auth/hooks/queries/useAdvertiser";
 import { useHistory } from "react-router-dom";
@@ -11,6 +10,17 @@ import _ from "lodash";
 import { useTrackMatomoEvent } from "@/hooks/useTrackWithMatomo";
 import { useMutation } from "@apollo/client";
 import { CreativeInputWithType } from "@/user/views/adsManager/types";
+import { graphql } from "@/graphql-client/index";
+
+const Update_Creative_Payload = graphql(`
+  mutation AdsManagerUpdateCreativePayload(
+    $input: AdsManagerUpdateCreativeInput!
+  ) {
+    adsManagerUpdateCreativePayload(adsManagerUpdateCreativeInput: $input) {
+      id
+    }
+  }
+`);
 
 export function useSubmitCreative(props: { id: string }) {
   const { trackMatomoEvent } = useTrackMatomoEvent();
@@ -39,7 +49,7 @@ export function useSubmitCreative(props: { id: string }) {
     });
 
   const [updateCreative, { error: updateError, loading: updateLoading }] =
-    useMutation(UpdateCreativeDocument, {
+    useMutation(Update_Creative_Payload, {
       refetchQueries,
       onCompleted,
       onError,
@@ -65,7 +75,16 @@ export function useSubmitCreative(props: { id: string }) {
           });
         } else {
           await updateCreative({
-            variables: { input: input, id: props.id },
+            variables: {
+              input: {
+                id: props.id,
+                payloadNotification: input.payloadNotification,
+                payloadInlineContent: _.omit(
+                  input.payloadInlineContent,
+                  "dimensions",
+                ),
+              },
+            },
           });
         }
       } finally {