From 0a334b9b8780f97def066e59c28e5cab211a9d14 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 16 Jun 2026 17:04:12 +0100
Subject: [PATCH 01/14] wip

---
 config/forms.php                              |  14 ++
 src/Actions/MarkNotSpam.php                   |  48 +++++++
 src/Forms/Submission.php                      |  55 +++++++-
 src/Http/Controllers/FormController.php       |  13 +-
 src/Jobs/DeleteDraftFormSubmissions.php       |  30 +++++
 src/Providers/AppServiceProvider.php          |   2 +
 tests/Actions/MarkNotSpamTest.php             |  50 +++++++
 .../Forms/DeleteDraftFormSubmissionsTest.php  |  82 +++++++++++
 tests/Forms/SubmissionTest.php                | 127 ++++++++++++++++++
 9 files changed, 407 insertions(+), 14 deletions(-)
 create mode 100644 src/Actions/MarkNotSpam.php
 create mode 100644 src/Jobs/DeleteDraftFormSubmissions.php
 create mode 100644 tests/Actions/MarkNotSpamTest.php
 create mode 100644 tests/Forms/DeleteDraftFormSubmissionsTest.php

diff --git a/config/forms.php b/config/forms.php
index c2d434f0289..e4cbb3e9ecc 100644
--- a/config/forms.php
+++ b/config/forms.php
@@ -35,6 +35,20 @@
 
     'send_email_job' => \Statamic\Forms\SendEmail::class,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Draft Submissions
+    |--------------------------------------------------------------------------
+    |
+    | Partial (or draft) submissions are automatically deleted after a set number
+    | of days. Set this to null to prevent the automatic deletion of drafts.
+    |
+    */
+
+    'drafts' => [
+        'delete_after' => 7,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Exporters
diff --git a/src/Actions/MarkNotSpam.php b/src/Actions/MarkNotSpam.php
new file mode 100644
index 00000000000..0250a4fb3ae
--- /dev/null
+++ b/src/Actions/MarkNotSpam.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Statamic\Actions;
+
+use Statamic\Contracts\Forms\Submission;
+use Statamic\Facades\Site;
+
+use function Statamic\trans as __;
+use function Statamic\trans_choice;
+
+class MarkNotSpam extends Action
+{
+    protected $icon = 'checkmark-circle';
+
+    public static function title()
+    {
+        return __('Mark As Not Spam');
+    }
+
+    public function visibleTo($item)
+    {
+        return $item instanceof Submission && $item->isSpam();
+    }
+
+    public function authorize($user, $submission)
+    {
+        return $user->can('delete', $submission);
+    }
+
+    public function confirmationText()
+    {
+        /** @translation */
+        return 'Are you sure you want to mark this submission as not spam?|Are you sure you want to mark these :count submissions as not spam?';
+    }
+
+    public function buttonText()
+    {
+        /** @translation */
+        return 'Mark As Not Spam|Mark :count as Not Spam';
+    }
+
+    public function run($submissions, $values)
+    {
+        $submissions->each->complete();
+
+        return trans_choice('Submission marked as not spam|Submissions marked as not spam', $submissions->count());
+    }
+}
diff --git a/src/Forms/Submission.php b/src/Forms/Submission.php
index 1ce97715656..b8f02484324 100644
--- a/src/Forms/Submission.php
+++ b/src/Forms/Submission.php
@@ -19,6 +19,7 @@
 use Statamic\Facades\Asset;
 use Statamic\Facades\File;
 use Statamic\Facades\FormSubmission;
+use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Forms\Uploaders\AssetsUploader;
 use Statamic\Forms\Uploaders\FilesUploader;
@@ -114,6 +115,30 @@ public function date()
         return Carbon::createFromTimestamp($this->id());
     }
 
+    public function isDraft(): bool
+    {
+        return (bool) $this->get('draft');
+    }
+
+    public function isSpam(): bool
+    {
+        return (bool) $this->get('spam');
+    }
+
+    public function isWithheld(): bool
+    {
+        return $this->isDraft() || $this->isSpam();
+    }
+
+    public function status(): string
+    {
+        return match (true) {
+            $this->isSpam() => 'spam',
+            $this->isDraft() => 'draft',
+            default => 'submitted',
+        };
+    }
+
     /**
      * Upload files and return asset IDs.
      *
@@ -152,6 +177,10 @@ public function save()
     {
         $isNew = is_null($this->form()->submission($this->id()));
 
+        // Withheld submissions (drafts & spam) are stored but skip the
+        // Creating/Created events so listeners never see an incomplete submission.
+        $withheld = $this->isWithheld();
+
         $withEvents = $this->withEvents;
         $this->withEvents = true;
 
@@ -159,7 +188,7 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
-            if ($isNew && SubmissionCreating::dispatch($this) === false) {
+            if ($isNew && ! $withheld && SubmissionCreating::dispatch($this) === false) {
                 return false;
             }
 
@@ -175,7 +204,7 @@ public function save()
         }
 
         if ($withEvents) {
-            if ($isNew) {
+            if ($isNew && ! $withheld) {
                 SubmissionCreated::dispatch($this);
             }
 
@@ -183,6 +212,28 @@ public function save()
         }
     }
 
+    public function complete()
+    {
+        $existed = ! is_null($this->form()->submission($this->id()));
+
+        $this->remove('draft')->remove('spam');
+
+        if ($this->form()->store()) {
+            $this->save();
+
+            // A promoted draft already existed, so save() won't fire the created
+            // event. We dispatch it here so completion always emits it once.
+            if ($existed) {
+                SubmissionCreated::dispatch($this);
+            }
+        } else {
+            SubmissionCreated::dispatch($this);
+        }
+
+        // TODO: Use $this->site() here when we add the "site" key to submissions.
+        SendEmails::dispatch($this, Site::default());
+    }
+
     public function deleteQuietly()
     {
         $this->withEvents = false;
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 1b151be7c80..477d9483c71 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -8,13 +8,11 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Events\FormSubmitted;
-use Statamic\Events\SubmissionCreated;
 use Statamic\Exceptions\SilentFormFailureException;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Form;
 use Statamic\Facades\Site;
 use Statamic\Forms\Exceptions\FileContentTypeRequiredException;
-use Statamic\Forms\SendEmails;
 use Statamic\Http\Requests\FrontendFormRequest;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -70,16 +68,7 @@ public function submit(FrontendFormRequest $request, $form)
             return $this->formSuccess($params, $submission, true);
         }
 
-        if ($form->store()) {
-            $submission->save();
-        } else {
-            // When the submission is saved, this same created event will be dispatched.
-            // We'll also fire it here if submissions are not configured to be stored
-            // so that developers may continue to listen and modify it as needed.
-            SubmissionCreated::dispatch($submission);
-        }
-
-        SendEmails::dispatch($submission, $site);
+        $submission->complete($site);
 
         return $this->formSuccess($params, $submission);
     }
diff --git a/src/Jobs/DeleteDraftFormSubmissions.php b/src/Jobs/DeleteDraftFormSubmissions.php
new file mode 100644
index 00000000000..927409fe15d
--- /dev/null
+++ b/src/Jobs/DeleteDraftFormSubmissions.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Statamic\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Statamic\Facades\FormSubmission;
+
+class DeleteDraftFormSubmissions implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable;
+
+    public function handle(): void
+    {
+        if (! ($days = config('statamic.forms.drafts.delete_after'))) {
+            return;
+        }
+
+        $threshold = now()->subDays($days);
+
+        FormSubmission::query()
+            ->where('draft', true)
+            ->where('date', '<', $threshold)
+            ->get()
+            ->each
+            ->delete();
+    }
+}
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index ea221a1bea6..c9b8023e194 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -20,6 +20,7 @@
 use Statamic\Facades\Token;
 use Statamic\Facades\User;
 use Statamic\Fields\FieldsetRecursionStack;
+use Statamic\Jobs\DeleteDraftFormSubmissions;
 use Statamic\Jobs\HandleEntrySchedule;
 use Statamic\Notifications\ElevatedSessionVerificationCode;
 use Statamic\Sites\Sites;
@@ -141,6 +142,7 @@ public function boot()
         $this->registerElevatedSessionMacros();
 
         $this->app->make(Schedule::class)->job(HandleEntrySchedule::class)->everyMinute();
+        $this->app->make(Schedule::class)->job(DeleteDraftFormSubmissions::class)->daily();
     }
 
     public function register()
diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
new file mode 100644
index 00000000000..ea60f302876
--- /dev/null
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Actions;
+
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Actions\MarkNotSpam;
+use Statamic\Events\FormSubmitted;
+use Statamic\Events\SubmissionCreated;
+use Statamic\Facades\Form;
+use Statamic\Forms\SendEmails;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class MarkNotSpamTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_is_only_visible_to_spam_submissions()
+    {
+        $form = tap(Form::make('contact'))->save();
+
+        $action = new MarkNotSpam;
+
+        $this->assertTrue($action->visibleTo($form->makeSubmission()->set('spam', true)));
+        $this->assertFalse($action->visibleTo($form->makeSubmission()));
+        $this->assertFalse($action->visibleTo($form->makeSubmission()->set('draft', true)));
+        $this->assertFalse($action->visibleTo($form));
+    }
+
+    #[Test]
+    public function it_removes_the_spam_key_and_dispatches_relevant_events()
+    {
+        Bus::fake();
+        Event::fake([SubmissionCreated::class]);
+
+        $form = tap(Form::make('contact'))->save();
+        $submission = $form->makeSubmission()->set('spam', true);
+        $submission->save();
+
+        (new MarkNotSpam)->run(collect([$submission]), []);
+
+        $this->assertFalse($submission->isSpam());
+
+        Event::assertDispatched(SubmissionCreated::class);
+        Bus::assertDispatched(SendEmails::class);
+    }
+}
diff --git a/tests/Forms/DeleteDraftFormSubmissionsTest.php b/tests/Forms/DeleteDraftFormSubmissionsTest.php
new file mode 100644
index 00000000000..01ab6ddee17
--- /dev/null
+++ b/tests/Forms/DeleteDraftFormSubmissionsTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Forms;
+
+use Carbon\Carbon;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\Form;
+use Statamic\Jobs\DeleteDraftFormSubmissions;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class DeleteDraftFormSubmissionsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    #[Test]
+    public function it_deletes_drafts_older_than_the_configured_threshold()
+    {
+        config(['statamic.forms.drafts.delete_after' => 7]);
+
+        $form = tap(Form::make('contact'))->save();
+
+        Carbon::setTestNow('2025-06-01 12:00:00');
+        $oldDraft = tap($form->makeSubmission()->set('draft', true))->save();
+
+        Carbon::setTestNow('2025-06-02 12:00:00');
+        $oldSubmission = tap($form->makeSubmission())->save();
+
+        Carbon::setTestNow('2025-06-14 12:00:00');
+        $recentDraft = tap($form->makeSubmission()->set('draft', true))->save();
+
+        Carbon::setTestNow('2025-06-15 12:00:00');
+
+        (new DeleteDraftFormSubmissions)->handle();
+
+        $this->assertNull($form->submission($oldDraft->id()));
+        $this->assertNotNull($form->submission($recentDraft->id()));
+        $this->assertNotNull($form->submission($oldSubmission->id()));
+    }
+
+    #[Test]
+    public function it_only_deletes_spam_submissions()
+    {
+        config(['statamic.forms.drafts.delete_after' => 7]);
+
+        $form = tap(Form::make('contact'))->save();
+
+        Carbon::setTestNow('2025-06-01 12:00:00');
+        $draft = tap($form->makeSubmission()->set('draft', true))->save();
+
+        Carbon::setTestNow('2025-06-02 12:00:00');
+        $submitted = tap($form->makeSubmission())->save();
+
+        Carbon::setTestNow('2025-06-03 12:00:00');
+        $spam = tap($form->makeSubmission()->set('spam', true))->save();
+
+        Carbon::setTestNow('2025-06-30 12:00:00');
+
+        (new DeleteDraftFormSubmissions)->handle();
+
+        $this->assertNull($form->submission($draft->id()));
+        $this->assertNotNull($form->submission($submitted->id()));
+        $this->assertNotNull($form->submission($spam->id()));
+    }
+
+    #[Test]
+    public function it_does_not_delete_anything_when_disabled()
+    {
+        config(['statamic.forms.drafts.delete_after' => null]);
+
+        $form = tap(Form::make('contact'))->save();
+
+        Carbon::setTestNow('2025-06-01 12:00:00');
+        $draft = tap($form->makeSubmission()->set('draft', true))->save();
+
+        Carbon::setTestNow('2025-06-30 12:00:00');
+
+        (new DeleteDraftFormSubmissions)->handle();
+
+        $this->assertNotNull($form->submission($draft->id()));
+    }
+}
diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index d19fde2c5d3..819ae475303 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
@@ -13,6 +14,8 @@
 use Statamic\Events\SubmissionSaved;
 use Statamic\Events\SubmissionSaving;
 use Statamic\Facades\Form;
+use Statamic\Facades\Site;
+use Statamic\Forms\SendEmails;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -240,6 +243,130 @@ public function it_deletes_quietly()
         $this->assertTrue($return);
     }
 
+    #[Test]
+    public function it_determines_its_status()
+    {
+        $form = tap(Form::make('contact_us'))->save();
+
+        $submitted = $form->makeSubmission();
+        $this->assertFalse($submitted->isDraft());
+        $this->assertFalse($submitted->isSpam());
+        $this->assertFalse($submitted->isWithheld());
+        $this->assertEquals('submitted', $submitted->status());
+
+        $draft = $form->makeSubmission()->set('draft', true);
+        $this->assertTrue($draft->isDraft());
+        $this->assertFalse($draft->isSpam());
+        $this->assertTrue($draft->isWithheld());
+        $this->assertEquals('draft', $draft->status());
+
+        $spam = $form->makeSubmission()->set('spam', true);
+        $this->assertTrue($spam->isSpam());
+        $this->assertFalse($spam->isDraft());
+        $this->assertTrue($spam->isWithheld());
+        $this->assertEquals('spam', $spam->status());
+    }
+
+    #[Test]
+    #[DataProvider('withheldStatusProvider')]
+    public function it_does_not_dispatch_creation_events_when_saving_a_withheld_submission(string $status)
+    {
+        Event::fake();
+
+        $form = tap(Form::make('contact_us'))->save();
+
+        $submission = $form->makeSubmission()->set($status, true);
+        $submission->save();
+
+        // Creation events shouldn't be dispatched.
+        Event::assertNotDispatched(SubmissionCreating::class);
+        Event::assertNotDispatched(SubmissionCreated::class);
+
+        // But, saving events should.
+        Event::assertDispatched(SubmissionSaving::class);
+        Event::assertDispatched(SubmissionSaved::class);
+    }
+
+    public static function withheldStatusProvider(): array
+    {
+        return [
+            'draft' => ['draft'],
+            'spam' => ['spam'],
+        ];
+    }
+
+    #[Test]
+    public function created_event_is_not_automatically_dispatched_when_removing_the_draft_key()
+    {
+        $form = tap(Form::make('contact_us'))->save();
+
+        $submission = $form->makeSubmission()->set('draft', true);
+        $submission->save();
+
+        Event::fake();
+
+        // Removing the draft key turns it into a "real" submission, but because the
+        // record already exists, save() alone won't dispatch Created. This is why
+        // complete() dispatches it explicitly (covered by the test below).
+        $submission->remove('draft');
+        $submission->save();
+
+        Event::assertNotDispatched(SubmissionCreating::class);
+        Event::assertNotDispatched(SubmissionCreated::class);
+        Event::assertDispatched(SubmissionSaved::class);
+    }
+
+    #[Test]
+    public function completing_a_new_submission_dispatches_created_event_once()
+    {
+        Bus::fake();
+        Event::fake([SubmissionCreated::class]);
+
+        $form = tap(Form::make('contact_us'))->save();
+        $submission = $form->makeSubmission();
+
+        $submission->complete(Site::default());
+
+        Event::assertDispatched(SubmissionCreated::class, 1);
+        Bus::assertDispatched(SendEmails::class, 1);
+        $this->assertNotNull($form->submission($submission->id()));
+    }
+
+    #[Test]
+    public function completing_a_withheld_submission_removes_the_status_key_and_dispatches_events()
+    {
+        $form = tap(Form::make('contact_us'))->save();
+        $submission = tap($form->makeSubmission()->set('draft', true)->set('spam', true))->save();
+
+        Bus::fake();
+        Event::fake([SubmissionCreated::class, SubmissionCreating::class]);
+
+        $submission->complete(Site::default());
+
+        $this->assertFalse($submission->isWithheld());
+
+        // Submission already exists, so save() won't dispatch the Created event, complete() will.
+        Event::assertDispatched(SubmissionCreated::class, 1);
+        Event::assertNotDispatched(SubmissionCreating::class);
+        Bus::assertDispatched(SendEmails::class, 1);
+    }
+
+    #[Test]
+    public function completing_a_submission_for_a_non_storing_form_still_dispatches_the_created_event()
+    {
+        Bus::fake();
+        Event::fake([SubmissionCreated::class]);
+
+        $form = tap(Form::make('contact_us')->store(false))->save();
+        $submission = $form->makeSubmission();
+
+        $submission->complete(Site::default());
+
+        Event::assertDispatched(SubmissionCreated::class, 1);
+        Bus::assertDispatched(SendEmails::class, 1);
+        $this->assertNull($form->submission($submission->id()));
+    }
+
     #[Test]
     public function it_clones_internal_collections()
     {

From 14e42574d96d4ab60ac6776a630e428e9f280144 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 09:38:20 +0100
Subject: [PATCH 02/14] rename draft to incomplete

---
 config/forms.php                              |  4 +--
 src/Forms/Submission.php                      | 19 ++++++-----
 ...hp => DeleteIncompleteFormSubmissions.php} |  6 ++--
 src/Providers/AppServiceProvider.php          |  4 +--
 tests/Actions/MarkNotSpamTest.php             |  5 ++-
 ...> DeleteIncompleteFormSubmissionsTest.php} | 16 ++++-----
 tests/Forms/SubmissionTest.php                | 33 ++++++++++---------
 7 files changed, 43 insertions(+), 44 deletions(-)
 rename src/Jobs/{DeleteDraftFormSubmissions.php => DeleteIncompleteFormSubmissions.php} (74%)
 rename tests/Forms/{DeleteDraftFormSubmissionsTest.php => DeleteIncompleteFormSubmissionsTest.php} (80%)

diff --git a/config/forms.php b/config/forms.php
index e4cbb3e9ecc..c75154fe4ac 100644
--- a/config/forms.php
+++ b/config/forms.php
@@ -45,9 +45,7 @@
     |
     */
 
-    'drafts' => [
-        'delete_after' => 7,
-    ],
+    'delete_incomplete_submissions_after' => 7,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/Forms/Submission.php b/src/Forms/Submission.php
index b8f02484324..eb11269741f 100644
--- a/src/Forms/Submission.php
+++ b/src/Forms/Submission.php
@@ -115,9 +115,9 @@ public function date()
         return Carbon::createFromTimestamp($this->id());
     }
 
-    public function isDraft(): bool
+    public function isIncomplete(): bool
     {
-        return (bool) $this->get('draft');
+        return (bool) $this->get('incomplete');
     }
 
     public function isSpam(): bool
@@ -125,17 +125,18 @@ public function isSpam(): bool
         return (bool) $this->get('spam');
     }
 
+    // todo: refactor or rename
     public function isWithheld(): bool
     {
-        return $this->isDraft() || $this->isSpam();
+        return $this->isIncomplete() || $this->isSpam();
     }
 
     public function status(): string
     {
         return match (true) {
             $this->isSpam() => 'spam',
-            $this->isDraft() => 'draft',
-            default => 'submitted',
+            $this->isIncomplete() => 'incomplete',
+            default => 'complete',
         };
     }
 
@@ -177,8 +178,8 @@ public function save()
     {
         $isNew = is_null($this->form()->submission($this->id()));
 
-        // Withheld submissions (drafts & spam) are stored but skip the
-        // Creating/Created events so listeners never see an incomplete submission.
+        // Incomplete and spam submissions are stored but skip the Creating/Created
+        // events so listeners never receive an incomplete submission.
         $withheld = $this->isWithheld();
 
         $withEvents = $this->withEvents;
@@ -216,12 +217,12 @@ public function complete()
     {
         $existed = ! is_null($this->form()->submission($this->id()));
 
-        $this->remove('draft')->remove('spam');
+        $this->remove('incomplete')->remove('spam');
 
         if ($this->form()->store()) {
             $this->save();
 
-            // A promoted draft already existed, so save() won't fire the created
+            // A promoted incomplete already existed, so save() won't fire the created
             // event. We dispatch it here so completion always emits it once.
             if ($existed) {
                 SubmissionCreated::dispatch($this);
diff --git a/src/Jobs/DeleteDraftFormSubmissions.php b/src/Jobs/DeleteIncompleteFormSubmissions.php
similarity index 74%
rename from src/Jobs/DeleteDraftFormSubmissions.php
rename to src/Jobs/DeleteIncompleteFormSubmissions.php
index 927409fe15d..75813ad0be5 100644
--- a/src/Jobs/DeleteDraftFormSubmissions.php
+++ b/src/Jobs/DeleteIncompleteFormSubmissions.php
@@ -8,20 +8,20 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Statamic\Facades\FormSubmission;
 
-class DeleteDraftFormSubmissions implements ShouldQueue
+class DeleteIncompleteFormSubmissions implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;
 
     public function handle(): void
     {
-        if (! ($days = config('statamic.forms.drafts.delete_after'))) {
+        if (! ($days = config('statamic.forms.delete_incomplete_submissions_after'))) {
             return;
         }
 
         $threshold = now()->subDays($days);
 
         FormSubmission::query()
-            ->where('draft', true)
+            ->where('incomplete', true)
             ->where('date', '<', $threshold)
             ->get()
             ->each
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index c9b8023e194..a16471f21d6 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -20,7 +20,7 @@
 use Statamic\Facades\Token;
 use Statamic\Facades\User;
 use Statamic\Fields\FieldsetRecursionStack;
-use Statamic\Jobs\DeleteDraftFormSubmissions;
+use Statamic\Jobs\DeleteIncompleteFormSubmissions;
 use Statamic\Jobs\HandleEntrySchedule;
 use Statamic\Notifications\ElevatedSessionVerificationCode;
 use Statamic\Sites\Sites;
@@ -142,7 +142,7 @@ public function boot()
         $this->registerElevatedSessionMacros();
 
         $this->app->make(Schedule::class)->job(HandleEntrySchedule::class)->everyMinute();
-        $this->app->make(Schedule::class)->job(DeleteDraftFormSubmissions::class)->daily();
+        $this->app->make(Schedule::class)->job(DeleteIncompleteFormSubmissions::class)->daily();
     }
 
     public function register()
diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index ea60f302876..ed3f13af9cf 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -24,10 +24,9 @@ public function it_is_only_visible_to_spam_submissions()
 
         $action = new MarkNotSpam;
 
-        $this->assertTrue($action->visibleTo($form->makeSubmission()->set('spam', true)));
         $this->assertFalse($action->visibleTo($form->makeSubmission()));
-        $this->assertFalse($action->visibleTo($form->makeSubmission()->set('draft', true)));
-        $this->assertFalse($action->visibleTo($form));
+        $this->assertFalse($action->visibleTo($form->makeSubmission()->set('incomplete', true)));
+        $this->assertTrue($action->visibleTo($form->makeSubmission()->set('spam', true)));
     }
 
     #[Test]
diff --git a/tests/Forms/DeleteDraftFormSubmissionsTest.php b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
similarity index 80%
rename from tests/Forms/DeleteDraftFormSubmissionsTest.php
rename to tests/Forms/DeleteIncompleteFormSubmissionsTest.php
index 01ab6ddee17..8aea94d8ceb 100644
--- a/tests/Forms/DeleteDraftFormSubmissionsTest.php
+++ b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
@@ -5,18 +5,18 @@
 use Carbon\Carbon;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\Form;
-use Statamic\Jobs\DeleteDraftFormSubmissions;
+use Statamic\Jobs\DeleteIncompleteFormSubmissions;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
-class DeleteDraftFormSubmissionsTest extends TestCase
+class DeleteIncompleteFormSubmissionsTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
 
     #[Test]
     public function it_deletes_drafts_older_than_the_configured_threshold()
     {
-        config(['statamic.forms.drafts.delete_after' => 7]);
+        config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
 
@@ -31,7 +31,7 @@ public function it_deletes_drafts_older_than_the_configured_threshold()
 
         Carbon::setTestNow('2025-06-15 12:00:00');
 
-        (new DeleteDraftFormSubmissions)->handle();
+        (new DeleteIncompleteFormSubmissions)->handle();
 
         $this->assertNull($form->submission($oldDraft->id()));
         $this->assertNotNull($form->submission($recentDraft->id()));
@@ -41,7 +41,7 @@ public function it_deletes_drafts_older_than_the_configured_threshold()
     #[Test]
     public function it_only_deletes_spam_submissions()
     {
-        config(['statamic.forms.drafts.delete_after' => 7]);
+        config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
 
@@ -56,7 +56,7 @@ public function it_only_deletes_spam_submissions()
 
         Carbon::setTestNow('2025-06-30 12:00:00');
 
-        (new DeleteDraftFormSubmissions)->handle();
+        (new DeleteIncompleteFormSubmissions)->handle();
 
         $this->assertNull($form->submission($draft->id()));
         $this->assertNotNull($form->submission($submitted->id()));
@@ -66,7 +66,7 @@ public function it_only_deletes_spam_submissions()
     #[Test]
     public function it_does_not_delete_anything_when_disabled()
     {
-        config(['statamic.forms.drafts.delete_after' => null]);
+        config(['statamic.forms.delete_incomplete_submissions_after' => null]);
 
         $form = tap(Form::make('contact'))->save();
 
@@ -75,7 +75,7 @@ public function it_does_not_delete_anything_when_disabled()
 
         Carbon::setTestNow('2025-06-30 12:00:00');
 
-        (new DeleteDraftFormSubmissions)->handle();
+        (new DeleteIncompleteFormSubmissions)->handle();
 
         $this->assertNotNull($form->submission($draft->id()));
     }
diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index 819ae475303..b0a39472a01 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -249,20 +249,20 @@ public function it_determines_its_status()
         $form = tap(Form::make('contact_us'))->save();
 
         $submitted = $form->makeSubmission();
-        $this->assertFalse($submitted->isDraft());
+        $this->assertFalse($submitted->isIncomplete());
         $this->assertFalse($submitted->isSpam());
         $this->assertFalse($submitted->isWithheld());
-        $this->assertEquals('submitted', $submitted->status());
+        $this->assertEquals('complete', $submitted->status());
 
-        $draft = $form->makeSubmission()->set('draft', true);
-        $this->assertTrue($draft->isDraft());
-        $this->assertFalse($draft->isSpam());
-        $this->assertTrue($draft->isWithheld());
-        $this->assertEquals('draft', $draft->status());
+        $incomplete = $form->makeSubmission()->set('incomplete', true);
+        $this->assertTrue($incomplete->isIncomplete());
+        $this->assertFalse($incomplete->isSpam());
+        $this->assertTrue($incomplete->isWithheld());
+        $this->assertEquals('incomplete', $incomplete->status());
 
         $spam = $form->makeSubmission()->set('spam', true);
         $this->assertTrue($spam->isSpam());
-        $this->assertFalse($spam->isDraft());
+        $this->assertFalse($spam->isIncomplete());
         $this->assertTrue($spam->isWithheld());
         $this->assertEquals('spam', $spam->status());
     }
@@ -290,25 +290,25 @@ public function it_does_not_dispatch_creation_events_when_saving_a_withheld_subm
     public static function withheldStatusProvider(): array
     {
         return [
-            'draft' => ['draft'],
+            'incomplete' => ['incomplete'],
             'spam' => ['spam'],
         ];
     }
 
     #[Test]
-    public function created_event_is_not_automatically_dispatched_when_removing_the_draft_key()
+    public function created_event_is_not_automatically_dispatched_when_removing_the_incomplete_key()
     {
         $form = tap(Form::make('contact_us'))->save();
 
-        $submission = $form->makeSubmission()->set('draft', true);
+        $submission = $form->makeSubmission()->set('incomplete', true);
         $submission->save();
 
         Event::fake();
 
-        // Removing the draft key turns it into a "real" submission, but because the
-        // record already exists, save() alone won't dispatch Created. This is why
+        // Removing the incomplete key turns it into a "real" submission, but because
+        // the record already exists, save() alone won't dispatch Created. This is why
         // complete() dispatches it explicitly (covered by the test below).
-        $submission->remove('draft');
+        $submission->remove('incomplete');
         $submission->save();
 
         Event::assertNotDispatched(SubmissionCreating::class);
@@ -329,14 +329,15 @@ public function completing_a_new_submission_dispatches_created_event_once()
 
         Event::assertDispatched(SubmissionCreated::class, 1);
         Bus::assertDispatched(SendEmails::class, 1);
+
         $this->assertNotNull($form->submission($submission->id()));
     }
 
     #[Test]
-    public function completing_a_withheld_submission_removes_the_status_key_and_dispatches_events()
+    public function completing_an_incomplete_or_spam_submission_removes_the_status_key_and_dispatches_events()
     {
         $form = tap(Form::make('contact_us'))->save();
-        $submission = tap($form->makeSubmission()->set('draft', true)->set('spam', true))->save();
+        $submission = tap($form->makeSubmission()->set('incomplete', true)->set('spam', true))->save();
 
         Bus::fake();
         Event::fake([SubmissionCreated::class, SubmissionCreating::class]);

From dc3a5f5d67c1cf69457321dc0f64cc51258d7fbf Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 09:50:01 +0100
Subject: [PATCH 03/14] push filters into the query string like other listings

---
 resources/js/components/forms/SubmissionListing.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index 3ca80b6df83..030e61f6f08 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -9,6 +9,7 @@
         :sort-direction="sortDirection"
         :preferences-prefix="preferencesPrefix"
         :filters="filters"
+        push-query
     >
         <template #cell-datestamp="{ row: submission, value }">
             <Link :href="submission.url">

From 059b1852353bad47461ba162a646ff583fe8660c Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 10:47:03 +0100
Subject: [PATCH 04/14] wip

---
 src/Providers/ExtensionServiceProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 51f32fd4e09..8ec6936c015 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -34,6 +34,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Actions\Delete::class,
         Actions\DeleteFakeSubmissions::class,
         Actions\DeleteMultisiteEntry::class,
+        Actions\MarkNotSpam::class,
         Actions\DisableTwoFactorAuthentication::class,
         Actions\DownloadAsset::class,
         Actions\DownloadAssetFolder::class,

From 8f2a870fa1d85760f559e05e600de02260ff22cf Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 10:47:36 +0100
Subject: [PATCH 05/14] show complete submissions by default

---
 src/Providers/ExtensionServiceProvider.php    |  1 +
 src/Query/Scopes/Filters/SubmissionStatus.php | 60 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 src/Query/Scopes/Filters/SubmissionStatus.php

diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 8ec6936c015..0616624794d 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -201,6 +201,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Scopes\Filters\Fields::class,
         Scopes\Filters\Blueprint::class,
         Scopes\Filters\Status::class,
+        Scopes\Filters\SubmissionStatus::class,
         Scopes\Filters\Site::class,
         Scopes\Filters\UserRole::class,
         Scopes\Filters\UserGroup::class,
diff --git a/src/Query/Scopes/Filters/SubmissionStatus.php b/src/Query/Scopes/Filters/SubmissionStatus.php
new file mode 100644
index 00000000000..a7af9043cc0
--- /dev/null
+++ b/src/Query/Scopes/Filters/SubmissionStatus.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Statamic\Query\Scopes\Filters;
+
+use Statamic\Query\Scopes\Filter;
+
+use function Statamic\trans as __;
+
+class SubmissionStatus extends Filter
+{
+    protected $pinned = true;
+
+    public static function title()
+    {
+        return __('Status');
+    }
+
+    public function fieldItems()
+    {
+        return [
+            'status' => [
+                'type' => 'radio',
+                'options' => $this->options()->all(),
+            ],
+        ];
+    }
+
+    public function autoApply()
+    {
+        return ['status' => 'complete'];
+    }
+
+    public function apply($query, $values)
+    {
+        match ($values['status']) {
+            'incomplete' => $query->where('incomplete', true),
+            'spam' => $query->where('spam', true),
+            default => $query->where('incomplete', '!=', true)->where('spam', '!=', true),
+        };
+    }
+
+    public function badge($values)
+    {
+        return $this->options()->get($values['status']);
+    }
+
+    public function visibleTo($key)
+    {
+        return $key === 'form-submissions';
+    }
+
+    protected function options()
+    {
+        return collect([
+            'complete' => __('Complete'),
+            'incomplete' => __('Incomplete'),
+            'spam' => __('Spam'),
+        ]);
+    }
+}

From cc5fc42ccfb49376ef6dfbdd9a641795c6f92416 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 10:47:52 +0100
Subject: [PATCH 06/14] add status indicator to submissions

---
 .../js/components/forms/SubmissionListing.vue | 15 ++++--
 .../forms/SubmissionStatusIndicator.vue       | 49 +++++++++++++++++++
 resources/js/components/ui/Publish/Form.vue   |  3 ++
 resources/js/pages/forms/Submission.vue       | 10 +++-
 .../CP/Forms/FormSubmissionsController.php    |  2 +
 .../CP/Submissions/ListedSubmission.php       |  6 +++
 .../Resources/CP/Submissions/Submissions.php  | 12 +++++
 7 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 resources/js/components/forms/SubmissionStatusIndicator.vue

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index 030e61f6f08..da157c20b5d 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -11,11 +11,15 @@
         :filters="filters"
         push-query
     >
-        <template #cell-datestamp="{ row: submission, value }">
-            <Link :href="submission.url">
-                <date-time :of="value" />
+        <template #cell-datestamp="{ row: submission, value, isColumnVisible }">
+            <Link class="title-index-field" :href="submission.url" @click.stop>
+                <SubmissionStatusIndicator v-if="!isColumnVisible('status')" :status="submission.status" />
+                <span><date-time :of="value" /></span>
             </Link>
         </template>
+        <template #cell-status="{ row: submission }">
+            <SubmissionStatusIndicator :status="submission.status" show-label :show-dot="false" />
+        </template>
         <template #prepended-row-actions="{ row: submission }">
             <DropdownItem :text="__('View')" :href="submission.url" icon="eye" />
         </template>
@@ -23,11 +27,12 @@
 </template>
 
 <script>
-import { Listing, DropdownItem } from '@/components/ui';
+import { Listing, DropdownItem, Badge, StatusIndicator } from '@/components/ui';
 import { Link } from '@inertiajs/vue3';
+import SubmissionStatusIndicator from '@/components/forms/SubmissionStatusIndicator.vue';
 
 export default {
-    components: { Link, DropdownItem, Listing },
+    components: { SubmissionStatusIndicator, Link, DropdownItem, Listing, Badge },
 
     props: {
         form: String,
diff --git a/resources/js/components/forms/SubmissionStatusIndicator.vue b/resources/js/components/forms/SubmissionStatusIndicator.vue
new file mode 100644
index 00000000000..d37762d21db
--- /dev/null
+++ b/resources/js/components/forms/SubmissionStatusIndicator.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({
+    status: {
+        type: String,
+        required: false,
+        default: 'complete',
+        validator: (value) => ['complete', 'incomplete', 'spam'].includes(value),
+    },
+    showDot: { type: Boolean, default: true },
+    showLabel: { type: Boolean, default: false },
+});
+
+const statusClass = computed(() => {
+    return {
+        complete: 'bg-green-400',
+        incomplete: 'bg-gray-300 dark:bg-gray-200',
+        spam: 'bg-amber-500',
+    }[props.status];
+});
+
+const label = computed(() => {
+    return {
+        complete: __('Complete'),
+        incomplete: __('Incomplete'),
+        spam: __('Spam')
+    }[props.status];
+});
+</script>
+
+<style>
+@reference "../../../css/app.css";
+
+.status-complete {
+    @apply bg-green-200 text-green-900 dark:bg-green-300/6 dark:text-green-300;
+}
+
+.status-spam {
+    @apply bg-amber-200 text-amber-900 dark:bg-amber-300/6 dark:text-amber-300;
+}
+</style>
+
+<template>
+    <span class="flex items-center gap-2">
+        <span v-if="showDot" class="size-2 rounded-full" :class="statusClass" v-tooltip="label" />
+        <span v-if="showLabel" class="status-index-field select-none" :class="`status-${status}`" v-text="label" />
+    </span>
+</template>
diff --git a/resources/js/components/ui/Publish/Form.vue b/resources/js/components/ui/Publish/Form.vue
index 8c156bf866a..35c4b22a99d 100644
--- a/resources/js/components/ui/Publish/Form.vue
+++ b/resources/js/components/ui/Publish/Form.vue
@@ -87,6 +87,9 @@ onUnmounted(() => saveKeyBinding.destroy());
 
 <template>
     <Header :title="title" :icon="icon">
+        <template v-if="!!$slots.title" #title>
+            <slot name="title" />
+        </template>
         <Button v-if="!readOnly" variant="primary" :text="__('Save')" @click="save" :disabled="saving" />
     </Header>
     <Container
diff --git a/resources/js/pages/forms/Submission.vue b/resources/js/pages/forms/Submission.vue
index 77592fc2782..eea9f941e6d 100644
--- a/resources/js/pages/forms/Submission.vue
+++ b/resources/js/pages/forms/Submission.vue
@@ -6,6 +6,7 @@ import { dateFormatter } from '@api';
 import Layout from '@/pages/layout/Layout.vue';
 import PanelLayout from '@/pages/layout/PanelLayout.vue';
 import FormsLayout from '@/pages/forms/Layout.vue';
+import SubmissionStatusIndicator from '@/components/forms/SubmissionStatusIndicator.vue';
 
 defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });
 
@@ -13,6 +14,7 @@ const props = defineProps([
     'form',
     'id',
     'formTitle',
+    'status',
     'date',
     'blueprint',
     'values',
@@ -30,13 +32,17 @@ provide('isFormSubmission', true);
         <Head :title="[title, formTitle, __('Forms')]" />
 
         <PublishForm
-            icon="forms"
             :title="formattedDate"
             :blueprint="blueprint"
             :initial-values="values"
             :initial-meta="meta"
             :submit-url="null"
             read-only
-        />
+        >
+            <template #title>
+                <SubmissionStatusIndicator :status="status" />
+                {{ formattedDate }}
+            </template>
+        </PublishForm>
     </div>
 </template>
diff --git a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
index 5eecb60a03a..e91c8ee77fc 100644
--- a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
+++ b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
@@ -36,6 +36,7 @@ public function index(FilteredRequest $request, $form)
         $columns = $form
             ->blueprint()
             ->columns()
+            ->prepend(Column::make('status'), 'status')
             ->prepend(Column::make('datestamp'), 'datestamp')
             ->setPreferred("forms.{$form->handle()}.columns")
             ->rejectUnlisted()
@@ -131,6 +132,7 @@ public function show($form, $submission)
             'form' => $form,
             'id' => $submission->id(),
             'formTitle' => $form->title(),
+            'status' => $submission->status(),
             'date' => $submission->date()->toIso8601String(),
             'blueprint' => $blueprint->toPublishArray(),
             'values' => $fields->values(),
diff --git a/src/Http/Resources/CP/Submissions/ListedSubmission.php b/src/Http/Resources/CP/Submissions/ListedSubmission.php
index 2f81734d40e..323b6995e2c 100644
--- a/src/Http/Resources/CP/Submissions/ListedSubmission.php
+++ b/src/Http/Resources/CP/Submissions/ListedSubmission.php
@@ -33,6 +33,7 @@ public function toArray($request)
             $this->merge($this->values([
                 'datestamp' => $this->resource->date()->tz(config('app.timezone'))->toIso8601String(),
             ])),
+            'status' => $this->resource->status(),
             'url' => cp_route('forms.submissions.show', [$form->handle(), $this->resource->id()]),
             'deleteable' => User::current()->can('delete', $this->resource),
         ];
@@ -42,6 +43,11 @@ protected function values($extra = [])
     {
         return $this->columns->mapWithKeys(function ($column) use ($extra) {
             $key = $column->field;
+
+            if ($key === 'status') {
+                return ['status' => $this->resource->status()];
+            }
+
             $value = $extra[$key] ?? $this->resource->get($key);
 
             if (! $field = $this->blueprint->field($key)) {
diff --git a/src/Http/Resources/CP/Submissions/Submissions.php b/src/Http/Resources/CP/Submissions/Submissions.php
index 3b51ff3106c..fd9e89386f6 100644
--- a/src/Http/Resources/CP/Submissions/Submissions.php
+++ b/src/Http/Resources/CP/Submissions/Submissions.php
@@ -6,6 +6,8 @@
 use Statamic\CP\Column;
 use Statamic\Http\Resources\CP\Concerns\HasRequestedColumns;
 
+use function Statamic\trans as __;
+
 class Submissions extends ResourceCollection
 {
     use HasRequestedColumns;
@@ -35,6 +37,16 @@ private function setColumns()
             ->columns()
             ->ensurePrepended(Column::make('datestamp')->label('Date'));
 
+        $status = Column::make('status')
+            ->label(__('Status'))
+            ->listable(true)
+            ->visible(true)
+            ->defaultVisibility(true)
+            ->defaultOrder($columns->count() + 1)
+            ->sortable(false);
+
+        $columns->put('status', $status);
+
         if ($key = $this->columnPreferenceKey) {
             $columns->setPreferred($key);
         }

From 33fd58fe0b78ec3eedf7d37a345ca1794ed7a98f Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 10:52:11 +0100
Subject: [PATCH 07/14] a few leftover bits from the rename

---
 config/forms.php                              |  6 ++--
 .../DeleteIncompleteFormSubmissionsTest.php   | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/forms.php b/config/forms.php
index c75154fe4ac..563b14b40e0 100644
--- a/config/forms.php
+++ b/config/forms.php
@@ -37,11 +37,11 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Draft Submissions
+    | Incomplete Submissions
     |--------------------------------------------------------------------------
     |
-    | Partial (or draft) submissions are automatically deleted after a set number
-    | of days. Set this to null to prevent the automatic deletion of drafts.
+    | Incomplete (partial) submissions are automatically deleted after a set
+    | number of days. Set this to null to prevent their automatic deletion.
     |
     */
 
diff --git a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
index 8aea94d8ceb..9c522aa3c04 100644
--- a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
+++ b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
@@ -14,42 +14,42 @@ class DeleteIncompleteFormSubmissionsTest extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     #[Test]
-    public function it_deletes_drafts_older_than_the_configured_threshold()
+    public function it_deletes_incomplete_submissions_older_than_the_configured_threshold()
     {
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
 
         Carbon::setTestNow('2025-06-01 12:00:00');
-        $oldDraft = tap($form->makeSubmission()->set('draft', true))->save();
+        $oldIncomplete = tap($form->makeSubmission()->set('incomplete', true))->save();
 
         Carbon::setTestNow('2025-06-02 12:00:00');
-        $oldSubmission = tap($form->makeSubmission())->save();
+        $oldComplete = tap($form->makeSubmission())->save();
 
         Carbon::setTestNow('2025-06-14 12:00:00');
-        $recentDraft = tap($form->makeSubmission()->set('draft', true))->save();
+        $recentIncomplete = tap($form->makeSubmission()->set('incomplete', true))->save();
 
         Carbon::setTestNow('2025-06-15 12:00:00');
 
         (new DeleteIncompleteFormSubmissions)->handle();
 
-        $this->assertNull($form->submission($oldDraft->id()));
-        $this->assertNotNull($form->submission($recentDraft->id()));
-        $this->assertNotNull($form->submission($oldSubmission->id()));
+        $this->assertNull($form->submission($oldIncomplete->id()));
+        $this->assertNotNull($form->submission($recentIncomplete->id()));
+        $this->assertNotNull($form->submission($oldComplete->id()));
     }
 
     #[Test]
-    public function it_only_deletes_spam_submissions()
+    public function it_only_deletes_incomplete_submissions_never_complete_or_spam()
     {
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
 
         Carbon::setTestNow('2025-06-01 12:00:00');
-        $draft = tap($form->makeSubmission()->set('draft', true))->save();
+        $incomplete = tap($form->makeSubmission()->set('incomplete', true))->save();
 
         Carbon::setTestNow('2025-06-02 12:00:00');
-        $submitted = tap($form->makeSubmission())->save();
+        $complete = tap($form->makeSubmission())->save();
 
         Carbon::setTestNow('2025-06-03 12:00:00');
         $spam = tap($form->makeSubmission()->set('spam', true))->save();
@@ -58,8 +58,8 @@ public function it_only_deletes_spam_submissions()
 
         (new DeleteIncompleteFormSubmissions)->handle();
 
-        $this->assertNull($form->submission($draft->id()));
-        $this->assertNotNull($form->submission($submitted->id()));
+        $this->assertNull($form->submission($incomplete->id()));
+        $this->assertNotNull($form->submission($complete->id()));
         $this->assertNotNull($form->submission($spam->id()));
     }
 
@@ -71,12 +71,12 @@ public function it_does_not_delete_anything_when_disabled()
         $form = tap(Form::make('contact'))->save();
 
         Carbon::setTestNow('2025-06-01 12:00:00');
-        $draft = tap($form->makeSubmission()->set('draft', true))->save();
+        $incomplete = tap($form->makeSubmission()->set('incomplete', true))->save();
 
         Carbon::setTestNow('2025-06-30 12:00:00');
 
         (new DeleteIncompleteFormSubmissions)->handle();
 
-        $this->assertNotNull($form->submission($draft->id()));
+        $this->assertNotNull($form->submission($incomplete->id()));
     }
 }

From 9c7fb638ae826c1631ea948e98baa876706e96e9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 11:41:19 +0100
Subject: [PATCH 08/14] remove `isWithheld` method

---
 src/Forms/Submission.php       | 12 +++---------
 tests/Forms/SubmissionTest.php |  6 ++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Forms/Submission.php b/src/Forms/Submission.php
index eb11269741f..dba1546141c 100644
--- a/src/Forms/Submission.php
+++ b/src/Forms/Submission.php
@@ -125,12 +125,6 @@ public function isSpam(): bool
         return (bool) $this->get('spam');
     }
 
-    // todo: refactor or rename
-    public function isWithheld(): bool
-    {
-        return $this->isIncomplete() || $this->isSpam();
-    }
-
     public function status(): string
     {
         return match (true) {
@@ -180,7 +174,7 @@ public function save()
 
         // Incomplete and spam submissions are stored but skip the Creating/Created
         // events so listeners never receive an incomplete submission.
-        $withheld = $this->isWithheld();
+        $isWithheld = $this->isIncomplete() || $this->isSpam();
 
         $withEvents = $this->withEvents;
         $this->withEvents = true;
@@ -189,7 +183,7 @@ public function save()
         $this->afterSaveCallbacks = [];
 
         if ($withEvents) {
-            if ($isNew && ! $withheld && SubmissionCreating::dispatch($this) === false) {
+            if ($isNew && ! $isWithheld && SubmissionCreating::dispatch($this) === false) {
                 return false;
             }
 
@@ -205,7 +199,7 @@ public function save()
         }
 
         if ($withEvents) {
-            if ($isNew && ! $withheld) {
+            if ($isNew && ! $isWithheld) {
                 SubmissionCreated::dispatch($this);
             }
 
diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index b0a39472a01..f8515e7cbc6 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -251,19 +251,16 @@ public function it_determines_its_status()
         $submitted = $form->makeSubmission();
         $this->assertFalse($submitted->isIncomplete());
         $this->assertFalse($submitted->isSpam());
-        $this->assertFalse($submitted->isWithheld());
         $this->assertEquals('complete', $submitted->status());
 
         $incomplete = $form->makeSubmission()->set('incomplete', true);
         $this->assertTrue($incomplete->isIncomplete());
         $this->assertFalse($incomplete->isSpam());
-        $this->assertTrue($incomplete->isWithheld());
         $this->assertEquals('incomplete', $incomplete->status());
 
         $spam = $form->makeSubmission()->set('spam', true);
         $this->assertTrue($spam->isSpam());
         $this->assertFalse($spam->isIncomplete());
-        $this->assertTrue($spam->isWithheld());
         $this->assertEquals('spam', $spam->status());
     }
 
@@ -344,7 +341,8 @@ public function completing_an_incomplete_or_spam_submission_removes_the_status_k
 
         $submission->complete(Site::default());
 
-        $this->assertFalse($submission->isWithheld());
+        $this->assertFalse($submission->isIncomplete());
+        $this->assertFalse($submission->isSpam());
 
         // Submission already exists, so save() won't dispatch the Created event, complete() will.
         Event::assertDispatched(SubmissionCreated::class, 1);

From 65fb4bfc7de9579d221f7b6ca6810fced81bcdc0 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 11:41:45 +0100
Subject: [PATCH 09/14] formatting

---
 src/Actions/MarkNotSpam.php       | 1 -
 tests/Actions/MarkNotSpamTest.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Actions/MarkNotSpam.php b/src/Actions/MarkNotSpam.php
index 0250a4fb3ae..4e869fa8db0 100644
--- a/src/Actions/MarkNotSpam.php
+++ b/src/Actions/MarkNotSpam.php
@@ -3,7 +3,6 @@
 namespace Statamic\Actions;
 
 use Statamic\Contracts\Forms\Submission;
-use Statamic\Facades\Site;
 
 use function Statamic\trans as __;
 use function Statamic\trans_choice;
diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index ed3f13af9cf..c8df9cb5f61 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -6,7 +6,6 @@
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Actions\MarkNotSpam;
-use Statamic\Events\FormSubmitted;
 use Statamic\Events\SubmissionCreated;
 use Statamic\Facades\Form;
 use Statamic\Forms\SendEmails;

From 49995d499704e11626cf2af8251722f7ecf67745 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 12:11:54 +0100
Subject: [PATCH 10/14] fix test namespace

---
 tests/Actions/MarkNotSpamTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index c8df9cb5f61..719ce9bfaa8 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Actions;
+namespace Tests\Actions;
 
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Event;

From 7cd4b227b8496a3ed05614f38ca80fa88f589e4e Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 13:44:07 +0100
Subject: [PATCH 11/14] skip new tests temporarily to see if it fixes the
 failing tests

---
 tests/Actions/MarkNotSpamTest.php                   |  4 ++++
 tests/Forms/DeleteIncompleteFormSubmissionsTest.php |  6 ++++++
 tests/Forms/SubmissionTest.php                      | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index 719ce9bfaa8..1860709486c 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -19,6 +19,8 @@ class MarkNotSpamTest extends TestCase
     #[Test]
     public function it_is_only_visible_to_spam_submissions()
     {
+        $this->markTestSkipped();
+
         $form = tap(Form::make('contact'))->save();
 
         $action = new MarkNotSpam;
@@ -31,6 +33,8 @@ public function it_is_only_visible_to_spam_submissions()
     #[Test]
     public function it_removes_the_spam_key_and_dispatches_relevant_events()
     {
+        $this->markTestSkipped();
+
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 
diff --git a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
index 9c522aa3c04..052a700148e 100644
--- a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
+++ b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
@@ -16,6 +16,8 @@ class DeleteIncompleteFormSubmissionsTest extends TestCase
     #[Test]
     public function it_deletes_incomplete_submissions_older_than_the_configured_threshold()
     {
+        $this->markTestSkipped();
+
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
@@ -41,6 +43,8 @@ public function it_deletes_incomplete_submissions_older_than_the_configured_thre
     #[Test]
     public function it_only_deletes_incomplete_submissions_never_complete_or_spam()
     {
+        $this->markTestSkipped();
+
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
@@ -66,6 +70,8 @@ public function it_only_deletes_incomplete_submissions_never_complete_or_spam()
     #[Test]
     public function it_does_not_delete_anything_when_disabled()
     {
+        $this->markTestSkipped();
+
         config(['statamic.forms.delete_incomplete_submissions_after' => null]);
 
         $form = tap(Form::make('contact'))->save();
diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index f8515e7cbc6..7671f7c0308 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -246,6 +246,8 @@ public function it_deletes_quietly()
     #[Test]
     public function it_determines_its_status()
     {
+        $this->markTestSkipped();
+
         $form = tap(Form::make('contact_us'))->save();
 
         $submitted = $form->makeSubmission();
@@ -268,6 +270,8 @@ public function it_determines_its_status()
     #[DataProvider('withheldStatusProvider')]
     public function it_does_not_dispatch_creation_events_when_saving_a_withheld_submission(string $status)
     {
+        $this->markTestSkipped();
+
         Event::fake();
 
         $form = tap(Form::make('contact_us'))->save();
@@ -295,6 +299,8 @@ public static function withheldStatusProvider(): array
     #[Test]
     public function created_event_is_not_automatically_dispatched_when_removing_the_incomplete_key()
     {
+        $this->markTestSkipped();
+
         $form = tap(Form::make('contact_us'))->save();
 
         $submission = $form->makeSubmission()->set('incomplete', true);
@@ -316,6 +322,8 @@ public function created_event_is_not_automatically_dispatched_when_removing_the_
     #[Test]
     public function completing_a_new_submission_dispatches_created_event_once()
     {
+        $this->markTestSkipped();
+
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 
@@ -333,6 +341,8 @@ public function completing_a_new_submission_dispatches_created_event_once()
     #[Test]
     public function completing_an_incomplete_or_spam_submission_removes_the_status_key_and_dispatches_events()
     {
+        $this->markTestSkipped();
+
         $form = tap(Form::make('contact_us'))->save();
         $submission = tap($form->makeSubmission()->set('incomplete', true)->set('spam', true))->save();
 
@@ -353,6 +363,8 @@ public function completing_an_incomplete_or_spam_submission_removes_the_status_k
     #[Test]
     public function completing_a_submission_for_a_non_storing_form_still_dispatches_the_created_event()
     {
+        $this->markTestSkipped();
+
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 

From d6c8ca8faa7f0897bd7fea3bd9a60b9e12f44cb0 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 13:57:19 +0100
Subject: [PATCH 12/14] wip

---
 tests/Forms/SubmissionTest.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/Forms/SubmissionTest.php b/tests/Forms/SubmissionTest.php
index 7671f7c0308..f8515e7cbc6 100644
--- a/tests/Forms/SubmissionTest.php
+++ b/tests/Forms/SubmissionTest.php
@@ -246,8 +246,6 @@ public function it_deletes_quietly()
     #[Test]
     public function it_determines_its_status()
     {
-        $this->markTestSkipped();
-
         $form = tap(Form::make('contact_us'))->save();
 
         $submitted = $form->makeSubmission();
@@ -270,8 +268,6 @@ public function it_determines_its_status()
     #[DataProvider('withheldStatusProvider')]
     public function it_does_not_dispatch_creation_events_when_saving_a_withheld_submission(string $status)
     {
-        $this->markTestSkipped();
-
         Event::fake();
 
         $form = tap(Form::make('contact_us'))->save();
@@ -299,8 +295,6 @@ public static function withheldStatusProvider(): array
     #[Test]
     public function created_event_is_not_automatically_dispatched_when_removing_the_incomplete_key()
     {
-        $this->markTestSkipped();
-
         $form = tap(Form::make('contact_us'))->save();
 
         $submission = $form->makeSubmission()->set('incomplete', true);
@@ -322,8 +316,6 @@ public function created_event_is_not_automatically_dispatched_when_removing_the_
     #[Test]
     public function completing_a_new_submission_dispatches_created_event_once()
     {
-        $this->markTestSkipped();
-
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 
@@ -341,8 +333,6 @@ public function completing_a_new_submission_dispatches_created_event_once()
     #[Test]
     public function completing_an_incomplete_or_spam_submission_removes_the_status_key_and_dispatches_events()
     {
-        $this->markTestSkipped();
-
         $form = tap(Form::make('contact_us'))->save();
         $submission = tap($form->makeSubmission()->set('incomplete', true)->set('spam', true))->save();
 
@@ -363,8 +353,6 @@ public function completing_an_incomplete_or_spam_submission_removes_the_status_k
     #[Test]
     public function completing_a_submission_for_a_non_storing_form_still_dispatches_the_created_event()
     {
-        $this->markTestSkipped();
-
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 

From ec60564c1a4dfad9f10c2e6feb9b5366df3a9b56 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 14:06:49 +0100
Subject: [PATCH 13/14] wip

---
 tests/Actions/MarkNotSpamTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index 1860709486c..719ce9bfaa8 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -19,8 +19,6 @@ class MarkNotSpamTest extends TestCase
     #[Test]
     public function it_is_only_visible_to_spam_submissions()
     {
-        $this->markTestSkipped();
-
         $form = tap(Form::make('contact'))->save();
 
         $action = new MarkNotSpam;
@@ -33,8 +31,6 @@ public function it_is_only_visible_to_spam_submissions()
     #[Test]
     public function it_removes_the_spam_key_and_dispatches_relevant_events()
     {
-        $this->markTestSkipped();
-
         Bus::fake();
         Event::fake([SubmissionCreated::class]);
 

From 3305cffb8ee37490346d39388dbd0054d0f69f72 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jun 2026 14:29:34 +0100
Subject: [PATCH 14/14] fix failing tests

---
 tests/Actions/MarkNotSpamTest.php                   |  7 +++++++
 tests/Forms/DeleteIncompleteFormSubmissionsTest.php | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/Actions/MarkNotSpamTest.php b/tests/Actions/MarkNotSpamTest.php
index 719ce9bfaa8..e3dac458411 100644
--- a/tests/Actions/MarkNotSpamTest.php
+++ b/tests/Actions/MarkNotSpamTest.php
@@ -16,6 +16,13 @@ class MarkNotSpamTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
 
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app['config']['statamic.forms.forms'] = $this->fakeStacheDirectory.'/forms';
+    }
+
     #[Test]
     public function it_is_only_visible_to_spam_submissions()
     {
diff --git a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
index 052a700148e..ed25ac2b853 100644
--- a/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
+++ b/tests/Forms/DeleteIncompleteFormSubmissionsTest.php
@@ -13,11 +13,16 @@ class DeleteIncompleteFormSubmissionsTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
 
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app['config']['statamic.forms.forms'] = $this->fakeStacheDirectory.'/forms';
+    }
+
     #[Test]
     public function it_deletes_incomplete_submissions_older_than_the_configured_threshold()
     {
-        $this->markTestSkipped();
-
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
@@ -43,8 +48,6 @@ public function it_deletes_incomplete_submissions_older_than_the_configured_thre
     #[Test]
     public function it_only_deletes_incomplete_submissions_never_complete_or_spam()
     {
-        $this->markTestSkipped();
-
         config(['statamic.forms.delete_incomplete_submissions_after' => 7]);
 
         $form = tap(Form::make('contact'))->save();
@@ -70,8 +73,6 @@ public function it_only_deletes_incomplete_submissions_never_complete_or_spam()
     #[Test]
     public function it_does_not_delete_anything_when_disabled()
     {
-        $this->markTestSkipped();
-
         config(['statamic.forms.delete_incomplete_submissions_after' => null]);
 
         $form = tap(Form::make('contact'))->save();