chore: simplify campaign management flags

brave · Oct 12, 2023 · e51637c · e51637c
1 parent 1e542ed
commit e51637c
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 22 deletions.
diff --git a/src/auth/components/AdvertiserAgreed.tsx b/src/auth/components/AdvertiserAgreed.tsx
@@ -20,7 +20,7 @@ import { PaymentType } from "graphql/types";
 export function AdvertiserAgreed() {
   const { advertiser } = useAdvertiser();
   const requiresPaymentAgree =
-    advertiser.selfServiceCreate &&
+    advertiser.selfServiceManageCampaign &&
     advertiser.selfServicePaymentType !== PaymentType.Netsuite;
   const history = useHistory();
   const { setSessionUser } = useAuthContext();

diff --git a/src/auth/context/auth.interface.ts b/src/auth/context/auth.interface.ts
@@ -5,8 +5,7 @@ import { PaymentType } from "graphql/types";
 export type IAdvertiser = {
   id: string;
   name: string;
-  selfServiceCreate: boolean;
-  selfServiceEdit: boolean;
+  selfServiceManageCampaign: boolean;
   selfServiceSetPrice: boolean;
   selfServicePaymentType: PaymentType;
   publicKey?: string | null;

diff --git a/src/auth/hooks/queries/useAdvertiser.ts b/src/auth/hooks/queries/useAdvertiser.ts
@@ -11,8 +11,7 @@ export function useAdvertiser(): {
   const defaultAdvertiser: IAdvertiser = {
     id: "",
     name: "",
-    selfServiceCreate: false,
-    selfServiceEdit: false,
+    selfServiceManageCampaign: false,
     selfServiceSetPrice: false,
     publicKey: null,
     selfServicePaymentType: PaymentType.Stripe,

diff --git a/src/auth/lib/index.ts b/src/auth/lib/index.ts
@@ -7,8 +7,7 @@ import { RegistrationForm } from "auth/registration/types";
 export type Advertiser = Pick<
   AdvertiserFragment,
   | "selfServiceSetPrice"
-  | "selfServiceCreate"
-  | "selfServiceEdit"
+  | "selfServiceManageCampaign"
   | "id"
   | "name"
   | "publicKey"

diff --git a/src/components/Drawer/MiniSideBar.tsx b/src/components/Drawer/MiniSideBar.tsx
@@ -54,7 +54,7 @@ export default function MiniSideBar({ children }: PropsWithChildren) {
           sx={{ color: "text.secondary" }}
         />
       ),
-      disabled: !advertiser.selfServiceCreate,
+      disabled: !advertiser.selfServiceManageCampaign,
     },
     {
       label: "Creatives",

diff --git a/src/components/Navigation/Navbar.tsx b/src/components/Navigation/Navbar.tsx
@@ -44,7 +44,7 @@ export function Navbar() {
         <Stack direction="row" alignItems="center" spacing={2}>
           <img src={ads} alt="Ads" height="31px" width="180px" />
           <Divider orientation="vertical" flexItem />
-          {advertiser.selfServiceCreate && <DraftMenu />}
+          {advertiser.selfServiceManageCampaign && <DraftMenu />}
         </Stack>
         <div style={{ flexGrow: 1 }} />
         {

diff --git a/src/components/Navigation/NewCampaignButton.tsx b/src/components/Navigation/NewCampaignButton.tsx
@@ -12,7 +12,7 @@ export function NewCampaignButton() {
     .utc()
     .valueOf()}/settings`;
 
-  if (!advertiser.selfServiceCreate) {
+  if (!advertiser.selfServiceManageCampaign) {
     return null;
   }
 

diff --git a/src/components/Navigation/NewImageButton.tsx b/src/components/Navigation/NewImageButton.tsx
@@ -4,7 +4,7 @@ import { Button } from "@mui/material";
 export function NewImageButton(props: { onClick: () => void }) {
   const { advertiser } = useAdvertiser();
 
-  if (!advertiser.selfServiceCreate) {
+  if (!advertiser.selfServiceManageCampaign) {
     return null;
   }
 

diff --git a/src/graphql/advertiser.generated.tsx b/src/graphql/advertiser.generated.tsx
diff --git a/src/graphql/advertiser.graphql b/src/graphql/advertiser.graphql
@@ -13,8 +13,7 @@ fragment Advertiser on Advertiser {
   ...AdvertiserSummary
   referrer
   phone
-  selfServiceEdit
-  selfServiceCreate
+  selfServiceManageCampaign
   selfServiceSetPrice
   mailingAddress {
     street1

diff --git a/src/graphql/types.ts b/src/graphql/types.ts
diff --git a/src/user/User.tsx b/src/user/User.tsx
@@ -66,13 +66,17 @@ export function User() {
                 <ProtectedRoute
                   path="/user/main/adsmanager/advanced/new/:draftId"
                   authedComponent={NewCampaign}
-                  validateAdvertiserProperty={(a) => a.selfServiceCreate}
+                  validateAdvertiserProperty={(a) =>
+                    a.selfServiceManageCampaign
+                  }
                 />
 
                 <ProtectedRoute
                   path="/user/main/adsmanager/advanced/:campaignId"
                   authedComponent={EditCampaign}
-                  validateAdvertiserProperty={(a) => a.selfServiceEdit}
+                  validateAdvertiserProperty={(a) =>
+                    a.selfServiceManageCampaign
+                  }
                 />
 
                 <ProtectedRoute

diff --git a/src/user/views/user/CampaignView.tsx b/src/user/views/user/CampaignView.tsx
@@ -18,8 +18,6 @@ export function CampaignView() {
   const { advertiser } = useAdvertiser();
   const { fromDate } = useContext(FilterContext);
   const [selectedCampaigns, setSelectedCampaigns] = useState<string[]>([]);
-  const advertiserCanAction =
-    advertiser.selfServiceCreate && advertiser.selfServiceEdit;
 
   const handleCampaignSelect = useCallback(
     (c: string, include: boolean) => {
@@ -60,7 +58,7 @@ export function CampaignView() {
     <MiniSideBar>
       <CardContainer
         header={
-          advertiserCanAction ? (
+          advertiser.selfServiceManageCampaign ? (
             <CampaignHeader selectedCampaigns={selectedCampaigns} />
           ) : (
             "Campaigns"