Merge pull request #870 from brave/master

Production Release 2023-08-24

.eslintignore

@@ -1 +1,2 @@
 **/*.generated.tsx
+codegen.ts

codegen.ts

@@ -17,7 +17,7 @@ const config: CodegenConfig = {
         baseTypesPath: "graphql/types.ts",
       },
       plugins: ["typescript-operations", "typescript-react-apollo"],
-      config: { withHooks: true, withRefetchFn: true },
+      config: { withHooks: true, withRefetchFn: true, skipTypename: true },
     },
     "src/graphql/types.ts": {
       plugins: ["typescript"],

src/components/Campaigns/CampaignAgeFilter.tsx

@@ -1,17 +1,17 @@
 import { FormControlLabel, Switch, Typography } from "@mui/material";
 import _ from "lodash";
 import moment from "moment";
-import { Dispatch } from "react";
+import { useContext } from "react";
+import { FilterContext } from "state/context";
 
 interface Props {
-  fromDate: Date | null;
-  onChange: Dispatch<Date | null>;
   disabled?: boolean;
 }
 
-export const CampaignAgeFilter = ({ fromDate, onChange, disabled }: Props) => {
+export const CampaignAgeFilter = ({ disabled }: Props) => {
+  const { fromDate, setFromDate } = useContext(FilterContext);
   const onOldCampaignToggle = (showOld: boolean) => {
-    onChange(
+    setFromDate(
       showOld ? null : moment().subtract(6, "month").startOf("day").toDate(),
     );
   };

src/components/Campaigns/CloneCampaign.tsx

@@ -14,12 +14,13 @@ import {
   useCreateCampaignMutation,
 } from "graphql/campaign.generated";
 import { useHistory } from "react-router-dom";
-import { useState } from "react";
-import { AdvertiserCampaignsDocument } from "graphql/advertiser.generated";
+import { useContext, useState } from "react";
+import { refetchAdvertiserCampaignsQuery } from "graphql/advertiser.generated";
 import { createCampaignFromFragment } from "form/fragmentUtil";
 import { useAdvertiser } from "auth/hooks/queries/useAdvertiser";
 import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import { useUser } from "auth/hooks/queries/useUser";
+import { FilterContext } from "state/context";
 
 interface Props {
   campaignFragment?: CampaignFragment | null;
@@ -28,15 +29,18 @@ interface Props {
 
 export function CloneCampaign({ campaignFragment, useChip }: Props) {
   const { advertiser } = useAdvertiser();
+  const { fromDate } = useContext(FilterContext);
   const { userId } = useUser();
   const history = useHistory();
   const [open, setOpen] = useState(false);
 
   const [copyCampaign, { loading }] = useCreateCampaignMutation({
     refetchQueries: [
       {
-        query: AdvertiserCampaignsDocument,
-        variables: { id: advertiser.id },
+        ...refetchAdvertiserCampaignsQuery({
+          id: advertiser.id,
+          filter: { from: fromDate },
+        }),
       },
     ],
     onCompleted(data) {

src/components/EnhancedTable/renderers.tsx

@@ -2,23 +2,20 @@ import { Box, Tooltip } from "@mui/material";
 import _ from "lodash";
 import { format, formatDistanceToNow, parseISO } from "date-fns";
 import { CellValue } from "./EnhancedTable";
-import { ReactChild, ReactNode } from "react";
+import { ReactChild, ReactNode, useContext } from "react";
 import { formatInTimeZone } from "date-fns-tz";
 import enUS from "date-fns/locale/en-US";
 import {
   CampaignSummaryFragment,
   LoadCampaignAdsDocument,
   useUpdateCampaignMutation,
 } from "graphql/campaign.generated";
-import { AdvertiserCampaignsDocument } from "graphql/advertiser.generated";
-import {
-  useUpdateAdMutation,
-  useUpdateAdSetMutation,
-} from "graphql/ad-set.generated";
+import { useUpdateAdSetMutation } from "graphql/ad-set.generated";
 import { OnOff } from "../Switch/OnOff";
-import { AdDetails } from "user/ads/AdList";
 import { displayFromCampaignState } from "util/displayState";
 import { AdSetDetails } from "user/adSet/AdSetList";
+import { FilterContext } from "state/context";
+import { refetchAdvertiserCampaignsQuery } from "graphql/advertiser.generated";
 
 export type CellValueRenderer = (value: CellValue) => ReactNode;
 const ADS_DEFAULT_TIMEZONE = "America/New_York";
@@ -94,16 +91,16 @@ export function renderMonetaryAmount(
 }
 
 export function campaignOnOffState(
-  c: CampaignSummaryFragment & { fromDate: Date | null; advertiserId: string },
+  c: CampaignSummaryFragment & { advertiserId: string },
 ): ReactNode {
+  const { fromDate } = useContext(FilterContext);
   const [updateCampaign, { loading }] = useUpdateCampaignMutation({
     refetchQueries: [
       {
-        query: AdvertiserCampaignsDocument,
-        variables: {
+        ...refetchAdvertiserCampaignsQuery({
           id: c.advertiserId,
-          filter: { from: c.fromDate },
-        },
+          filter: { from: fromDate },
+        }),
       },
     ],
   });
@@ -163,36 +160,3 @@ export function adSetOnOffState(c: AdSetDetails): ReactNode {
     />
   );
 }
-
-export function adOnOffState(c: AdDetails): ReactNode {
-  const [updateAd, { loading }] = useUpdateAdMutation({
-    refetchQueries: [
-      {
-        query: AdvertiserCampaignsDocument,
-        variables: { id: c.campaignId },
-      },
-    ],
-  });
-
-  return (
-    <OnOff
-      onChange={(s) => {
-        {
-          updateAd({
-            variables: {
-              updateAdInput: {
-                id: c.id,
-                state: s,
-              },
-            },
-          });
-        }
-      }}
-      loading={loading}
-      state={c.state}
-      end={c.campaignEnd}
-      source={c.campaignSource}
-      type="Ad"
-    />
-  );
-}