Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/Http/Controllers/CP/RedirectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Statamic\SeoPro\Http\Controllers\CP;

use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Inertia\Inertia;
use Statamic\CP\Column;
use Statamic\CP\PublishForm;
Expand Down Expand Up @@ -131,10 +132,11 @@ public function store(Request $request)

$redirect = Facades\Redirect::make()
->site($siteHandle)
->source($values['source'])
->destination($values['destination'])
->responseCode($values['response_code'])
->enabled($values['enabled']);
->source(Arr::pull($values, 'source'))
->destination(Arr::pull($values, 'destination'))
->responseCode(Arr::pull($values, 'response_code'))
->enabled(Arr::pull($values, 'enabled'))
->data($values);

$redirect->save();

Expand Down Expand Up @@ -178,10 +180,11 @@ public function update(Request $request, Redirect $redirect)
$values = PublishForm::make(Facades\Redirect::blueprint())->submit($request->all());

$redirect
->source($values['source'])
->destination($values['destination'])
->responseCode($values['response_code'])
->enabled($values['enabled']);
->source(Arr::pull($values, 'source'))
->destination(Arr::pull($values, 'destination'))
->responseCode(Arr::pull($values, 'response_code'))
->enabled(Arr::pull($values, 'enabled'))
->data($values);

$redirect->save();
}
Expand Down
19 changes: 19 additions & 0 deletions tests/Redirects/StoreRedirectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,23 @@ public function source_must_be_unique()
])
->assertSessionHasErrors('source');
}

#[Test]
public function can_store_redirect_with_description()
{
$this
->actingAs(User::make()->makeSuper()->save())
->post(cp_route('seo-pro.redirects.store'), [
'source' => '/old-url',
'destination' => '/new-url',
'response_code' => 301,
'enabled' => true,
'description' => 'Keep this redirect for the old campaign.',
])
->assertOk();

$redirect = Facades\Redirect::query()->where('source', '/old-url')->first();

$this->assertEquals('Keep this redirect for the old campaign.', $redirect->get('description'));
}
}
28 changes: 28 additions & 0 deletions tests/Redirects/UpdateRedirectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,32 @@ public function can_update_redirect_without_changing_source()
$this->assertEquals('/old-url', $redirect->source());
$this->assertEquals('/updated-new-url', $redirect->destination());
}

#[Test]
public function can_update_redirect_with_description()
{
Facades\Redirect::make()
->id('abc')
->source('/old-url')
->destination('/new-url')
->responseCode(302)
->enabled(true)
->data(['description' => 'Original description.'])
->save();

$this
->actingAs(User::make()->makeSuper()->save())
->patch(cp_route('seo-pro.redirects.update', 'abc'), [
'source' => '/old-url',
'destination' => '/new-url',
'response_code' => 302,
'enabled' => true,
'description' => 'Updated description.',
])
->assertOk();

$redirect = Facades\Redirect::find('abc');

$this->assertEquals('Updated description.', $redirect->get('description'));
}
}
Loading