fix: change funtion signature

brave · Aug 17, 2023 · 38a2315 · 38a2315
1 parent 0554369
commit 38a2315
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/form/fragmentUtil.ts b/src/form/fragmentUtil.ts
@@ -5,7 +5,7 @@ import { AdSetFragment } from "graphql/ad-set.generated";
 
 export function createCampaignFromFragment(
   data: CampaignFragment,
-  userId: string,
+  userId?: string,
 ): CreateCampaignInput {
   const adSets: CreateAdSetInput[] = data.adSets.map((adSet) =>
     createAdSetFromFragment(adSet),

diff --git a/src/user/User.tsx b/src/user/User.tsx
@@ -51,19 +51,13 @@ export function User() {
               <ProtectedRoute
                 path="/user/main/adsmanager/advanced/new/:draftId"
                 authedComponent={NewCampaign}
-                validateAdvertiserProperty={{
-                  key: "selfServiceCreate",
-                  val: true,
-                }}
+                validateAdvertiserProperty={(a) => a.selfServiceCreate}
               />
 
               <ProtectedRoute
                 path="/user/main/adsmanager/advanced/:campaignId"
                 authedComponent={EditCampaign}
-                validateAdvertiserProperty={{
-                  key: "selfServiceEdit",
-                  val: true,
-                }}
+                validateAdvertiserProperty={(a) => a.selfServiceEdit}
               />
 
               <ProtectedRoute
@@ -101,25 +95,22 @@ interface ProtectedProps {
   authedComponent?: ComponentType;
   unauthedComponent?: ComponentType;
   path?: string;
-  validateAdvertiserProperty?: { key: keyof IAdvertiser; val: any };
+  validateAdvertiserProperty?: (a: IAdvertiser) => boolean;
 }
 
 const ProtectedRoute = ({
   authedComponent,
   unauthedComponent,
   path,
-  validateAdvertiserProperty,
+  validateAdvertiserProperty = () => true,
 }: ProtectedProps) => {
   const { advertiser } = useAdvertiser();
 
   if (!advertiser.agreed && unauthedComponent === undefined) {
     return <Redirect to="/user/main" />;
   }
 
-  if (
-    validateAdvertiserProperty &&
-    advertiser[validateAdvertiserProperty.key] != validateAdvertiserProperty.val
-  ) {
+  if (!validateAdvertiserProperty(advertiser)) {
     return <Redirect to="/user/main" />;
   }