Fixes editing campaign lists and scheduling deleted campaigns (#409)

parcelvoy · Mar 29, 2024 · b4cbf1b · b4cbf1b
1 parent 57ecb39
commit b4cbf1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/apps/platform/src/campaigns/CampaignGenerateListJob.ts b/apps/platform/src/campaigns/CampaignGenerateListJob.ts
@@ -15,6 +15,7 @@ export default class CampaignGenerateListJob extends Job {
         const key = `campaign_generate_${id}`
 
         const campaign = await getCampaign(id, project_id) as SentCampaign
+        if (!campaign) return
         if (campaign.state === 'aborted' || campaign.state === 'draft') return
 
         // Increase lock duration based on estimated send size

diff --git a/apps/platform/src/campaigns/ProcessCampaignsJob.ts b/apps/platform/src/campaigns/ProcessCampaignsJob.ts
@@ -11,6 +11,7 @@ export default class ProcessCampaignsJob extends Job {
         const campaigns = await Campaign.query()
             .whereIn('state', ['pending', 'scheduled', 'running'])
             .whereNotNull('send_at')
+            .whereNull('deleted_at')
             .where('type', 'blast')
         for (const campaign of campaigns) {
 

diff --git a/apps/ui/src/views/campaign/CampaignForm.tsx b/apps/ui/src/views/campaign/CampaignForm.tsx
@@ -200,7 +200,7 @@ const ProviderSelection = ({ providers, form }: { providers: Provider[], form: U
     )
 }
 
-const TypeSelection = ({ campaign, form }: { campaign?: Campaign, form: UseFormReturn<CampaignCreateParams> }) => {
+const TypeSelection = ({ campaign, showType, form }: { campaign?: Campaign, showType: boolean, form: UseFormReturn<CampaignCreateParams> }) => {
     const { t } = useTranslation()
     const type = useWatch({
         control: form.control,
@@ -215,14 +215,14 @@ const TypeSelection = ({ campaign, form }: { campaign?: Campaign, form: UseFormR
     }]
 
     return <>
-        <RadioInput.Field
+        {showType && <RadioInput.Field
             form={form}
             name="type"
             subtitle={t('campaign_form_type')}
             label={t('type')}
             options={options}
             required
-        />
+        />}
         {
             type !== 'trigger' && (
                 <>
@@ -303,9 +303,10 @@ export function CampaignForm({ campaign, onSave, type }: CampaignEditParams) {
                         name="tags"
                         label={t('tags')}
                     />
-                    {
-                        !type && <TypeSelection campaign={campaign} form={form} />
-                    }
+                    <TypeSelection
+                        campaign={campaign}
+                        form={form}
+                        showType={!type} />
                     {
                         campaign
                             ? (