Merge pull request #866 from brave/master

Production Release 2023-08-17

src/components/Campaigns/CloneCampaign.tsx

@@ -19,6 +19,7 @@ import { AdvertiserCampaignsDocument } 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";
 
 interface Props {
   campaignFragment?: CampaignFragment | null;
@@ -27,6 +28,7 @@ interface Props {
 
 export function CloneCampaign({ campaignFragment, useChip }: Props) {
   const { advertiser } = useAdvertiser();
+  const { userId } = useUser();
   const history = useHistory();
   const [open, setOpen] = useState(false);
 
@@ -94,7 +96,7 @@ export function CloneCampaign({ campaignFragment, useChip }: Props) {
               if (campaignFragment) {
                 copyCampaign({
                   variables: {
-                    input: createCampaignFromFragment(campaignFragment),
+                    input: createCampaignFromFragment(campaignFragment, userId),
                   },
                 });
               } else {

src/form/fragmentUtil.ts

@@ -5,13 +5,15 @@ import { AdSetFragment } from "graphql/ad-set.generated";
 
 export function createCampaignFromFragment(
   data: CampaignFragment,
+  userId?: string,
 ): CreateCampaignInput {
   const adSets: CreateAdSetInput[] = data.adSets.map((adSet) =>
     createAdSetFromFragment(adSet),
   );
 
   const two = moment().utc().add(3, "days");
   return {
+    userId,
     adSets: adSets && adSets.length > 0 ? adSets : undefined,
     advertiserId: data.advertiser.id,
     budget: data.budget,

src/user/User.tsx

@@ -18,6 +18,7 @@ import { Navbar } from "components/Navigation/Navbar";
 import { CampaignView } from "user/views/user/CampaignView";
 import { CampaignReportView } from "user/views/user/CampaignReportView";
 import { Profile } from "user/views/user/Profile";
+import { IAdvertiser } from "auth/context/auth.interface";
 
 const buildApolloClient = () => {
   const httpLink = createHttpLink({
@@ -50,11 +51,13 @@ export function User() {
               <ProtectedRoute
                 path="/user/main/adsmanager/advanced/new/:draftId"
                 authedComponent={NewCampaign}
+                validateAdvertiserProperty={(a) => a.selfServiceCreate}
               />
 
               <ProtectedRoute
                 path="/user/main/adsmanager/advanced/:campaignId"
                 authedComponent={EditCampaign}
+                validateAdvertiserProperty={(a) => a.selfServiceEdit}
               />
 
               <ProtectedRoute
@@ -92,19 +95,25 @@ interface ProtectedProps {
   authedComponent?: ComponentType;
   unauthedComponent?: ComponentType;
   path?: string;
+  validateAdvertiserProperty?: (a: IAdvertiser) => boolean;
 }
 
 const ProtectedRoute = ({
   authedComponent,
   unauthedComponent,
   path,
+  validateAdvertiserProperty = () => true,
 }: ProtectedProps) => {
   const { advertiser } = useAdvertiser();
 
   if (!advertiser.agreed && unauthedComponent === undefined) {
     return <Redirect to="/user/main" />;
   }
 
+  if (!validateAdvertiserProperty(advertiser)) {
+    return <Redirect to="/user/main" />;
+  }
+
   return (
     <Route
       path={path}

src/user/campaignList/CampaignList.tsx

@@ -177,7 +177,6 @@ interface CheckBoxProps {
   onCampaignSelect: (c: string, insert: boolean) => void;
 }
 const CampaignCheckBox = (props: CheckBoxProps) => {
-  console.log(props.selectedCampaigns);
   const campaignSelected = props.selectedCampaigns.some(
     (c) => c === props.campaign.id,
   );