Fix redirect URL mentions (#707)
This commit is contained in:
parent
d1902112dd
commit
65eebb7277
|
|
@ -57,8 +57,12 @@ class FormSubmissionProcessor
|
||||||
*/
|
*/
|
||||||
public function getRedirectData(Form $form, array $submissionData): array
|
public function getRedirectData(Form $form, array $submissionData): array
|
||||||
{
|
{
|
||||||
|
$formattedData = collect($submissionData)->map(function ($value, $key) {
|
||||||
|
return ['id' => $key, 'value' => $value];
|
||||||
|
})->values()->all();
|
||||||
|
|
||||||
$redirectUrl = ($form->redirect_url)
|
$redirectUrl = ($form->redirect_url)
|
||||||
? (new MentionParser($form->redirect_url, array_values($submissionData)))->urlFriendlyOutput()->parseAsText()
|
? (new MentionParser($form->redirect_url, $formattedData))->urlFriendlyOutput()->parseAsText()
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
if ($redirectUrl && !filter_var($redirectUrl, FILTER_VALIDATE_URL)) {
|
if ($redirectUrl && !filter_var($redirectUrl, FILTER_VALIDATE_URL)) {
|
||||||
|
|
|
||||||
|
|
@ -121,10 +121,7 @@ it('formats redirect data correctly for pro users', function () {
|
||||||
|
|
||||||
$processor = new FormSubmissionProcessor();
|
$processor = new FormSubmissionProcessor();
|
||||||
$redirectData = $processor->getRedirectData($form, [
|
$redirectData = $processor->getRedirectData($form, [
|
||||||
'field_1' => [
|
'field_1' => 'test-value'
|
||||||
'id' => 'field_1',
|
|
||||||
'value' => 'test-value'
|
|
||||||
]
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
expect($redirectData)->toBe([
|
expect($redirectData)->toBe([
|
||||||
|
|
@ -142,10 +139,7 @@ it('returns no redirect for non-pro users', function () {
|
||||||
|
|
||||||
$processor = new FormSubmissionProcessor();
|
$processor = new FormSubmissionProcessor();
|
||||||
$redirectData = $processor->getRedirectData($form, [
|
$redirectData = $processor->getRedirectData($form, [
|
||||||
'field_1' => [
|
'field_1' => 'test-value'
|
||||||
'id' => 'field_1',
|
|
||||||
'value' => 'test-value'
|
|
||||||
]
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
expect($redirectData)->toBe([
|
expect($redirectData)->toBe([
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue