fix: missed flags in different fragment

brave · Oct 12, 2023 · 4c44de3 · 4c44de3
1 parent 96f19f9
commit 4c44de3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 37 deletions.
diff --git a/src/components/Drawer/MiniSideBar.tsx b/src/components/Drawer/MiniSideBar.tsx
@@ -65,7 +65,7 @@ export default function MiniSideBar({ children }: PropsWithChildren) {
           sx={{ color: "text.secondary" }}
         />
       ),
-      disabled: !advertiser.selfServiceCreate,
+      disabled: !advertiser.selfServiceManageCampaign,
     },
     {
       label: "Audiences",

diff --git a/src/components/Navigation/NewCreativeButton.tsx b/src/components/Navigation/NewCreativeButton.tsx
@@ -8,7 +8,7 @@ export function NewCreativeButton() {
   const { advertiser } = useAdvertiser();
   const isNewCreativePage = url.includes(newUrl);
 
-  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
@@ -42,8 +42,7 @@ mutation updateAdvertiser($updateAdvertiserInput: UpdateAdvertiserInput!) {
 fragment AdvertiserCampaigns on Advertiser {
   id
   name
-  selfServiceEdit
-  selfServiceCreate
+  selfServiceManageCampaign
   selfServiceSetPrice
   campaigns {
     ...CampaignSummary

diff --git a/src/user/campaignList/CampaignList.tsx b/src/user/campaignList/CampaignList.tsx
@@ -53,17 +53,6 @@ export function CampaignList({
   });
 
   const columns: ColumnDescriptor<CampaignSummaryFragment>[] = [
-    {
-      title: "On/Off",
-      value: (c) => c.state,
-      extendedRenderer: (r) =>
-        campaignOnOffState({
-          ...r,
-          advertiserId: advertiser?.id ?? "",
-        }),
-      sx: { width: "1px", p: 0 },
-      sortable: false,
-    },
     {
       title: "Campaign",
       value: (c) => c.name,
@@ -137,22 +126,35 @@ export function CampaignList({
     },
   ];
 
-  if (advertiser?.selfServiceCreate && advertiser.selfServiceEdit) {
-    initialSort += 1;
-    columns.unshift({
-      title: "",
-      value: (c) => c.id,
-      sortable: false,
-      extendedRenderer: (r) => (
-        <CampaignCheckBox
-          campaign={r}
-          selectedCampaigns={selectedCampaigns}
-          onCampaignSelect={onCampaignSelect}
-        />
-      ),
-      align: "center",
-      sx: { width: "1px" },
-    });
+  if (advertiser?.selfServiceManageCampaign) {
+    initialSort += 2;
+    columns.unshift(
+      {
+        title: "On/Off",
+        value: (c) => c.state,
+        extendedRenderer: (r) =>
+          campaignOnOffState({
+            ...r,
+            advertiserId: advertiser?.id ?? "",
+          }),
+        sx: { width: "1px", p: 0 },
+        sortable: false,
+      },
+      {
+        title: "",
+        value: (c) => c.id,
+        sortable: false,
+        extendedRenderer: (r) => (
+          <CampaignCheckBox
+            campaign={r}
+            selectedCampaigns={selectedCampaigns}
+            onCampaignSelect={onCampaignSelect}
+          />
+        ),
+        align: "center",
+        sx: { width: "1px" },
+      },
+    );
   }
 
   return (