Skip to content

Beautiful Open-Source Form Builder

Add link_edit_submission field to EmailIntegration and update email n… (#854)

Chirag Chhatralab258d448a807
diff --git a/api/app/Integrations/Handlers/EmailIntegration.php b/api/app/Integrations/Handlers/EmailIntegration.php
index affbe9d49..62b0edfe0 100644
--- a/api/app/Integrations/Handlers/EmailIntegration.php
+++ b/api/app/Integrations/Handlers/EmailIntegration.php
@@ -27,6 +27,7 @@ class EmailIntegration extends AbstractIntegrationHandler
'include_submission_data' => 'boolean',
'include_hidden_fields_submission_data' => ['nullable', 'boolean'],
'reply_to' => 'nullable',
+ 'link_edit_submission' => ['nullable', 'boolean']
];
if ($form->is_pro || config('app.self_hosted')) {
diff --git a/api/resources/views/mail/form/email-notification.blade.php b/api/resources/views/mail/form/email-notification.blade.php
index bf268d0ef..1e6630535 100644
--- a/api/resources/views/mail/form/email-notification.blade.php
+++ b/api/resources/views/mail/form/email-notification.blade.php
@@ -2,7 +2,7 @@
{!! $emailContent !!}
-@if($form->editable_submissions)
+@if(($integrationData->link_edit_submission ?? false) && $form->editable_submissions)
@component('mail::button', ['url' => $form->share_url.'?submission_id='.$submission_id])
{{($form->editable_submissions_button_text ?? 'Edit submission')}}
@endcomponent
@@ -12,8 +12,8 @@
@foreach($fields as $field)
@if(isset($field['value']))
<p style="white-space: pre-wrap; border-top: 1px solid #9ca3af;">
-<b>{{$field['name']}}</b>
-{!! is_array($field['value'])?implode(',',$field['value']):$field['value']!!}
+ <b>{{$field['name']}}</b>
+ {!! is_array($field['value'])?implode(',',$field['value']):$field['value']!!}
</p>
@endif
@endforeach
diff --git a/api/tests/Feature/Forms/EmailNotificationTest.php b/api/tests/Feature/Forms/EmailNotificationTest.php
index 668c22aa1..da6904f11 100644
--- a/api/tests/Feature/Forms/EmailNotificationTest.php
+++ b/api/tests/Feature/Forms/EmailNotificationTest.php
@@ -325,3 +325,65 @@ it('send email with hidden field as mention to send email', function () {
}
);
});
+
+it('send email with the edit submission link', function () {
+ $user = $this->actingAsProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace, [
+ 'editable_submissions' => true,
+ 'editable_submissions_button_text' => 'Edit submission'
+ ]);
+ $integrationData = $this->createFormIntegration('email', $form->id, [
+ 'send_to' => $user->email,
+ 'sender_name' => 'OpnForm',
+ 'subject' => 'New form submission',
+ 'email_content' => 'Hello there πŸ‘‹ <br>Test body',
+ 'include_submission_data' => true,
+ 'include_hidden_fields_submission_data' => false,
+ 'reply_to' => '[email protected]',
+ 'link_edit_submission' => true,
+ ]);
+
+ $formData = $this->generateFormSubmissionData($form);
+
+ $event = new \App\Events\Forms\FormSubmitted($form, $formData);
+ $mailable = new FormEmailNotification($event, $integrationData, 'mail');
+ $notifiable = new AnonymousNotifiable();
+ $notifiable->route('mail', $user->email);
+ $renderedMail = $mailable->toMail($notifiable);
+ expect($renderedMail->subject)->toBe('New form submission');
+ expect($renderedMail->replyTo[0][0])->toBe('[email protected]');
+ expect(trim($renderedMail->render()))->toContain('Test body');
+ expect(trim($renderedMail->render()))->toContain('Edit submission');
+});
+
+it('send email without the edit submission link', function () {
+ $user = $this->actingAsProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace, [
+ 'editable_submissions' => true,
+ 'editable_submissions_button_text' => 'Edit submission'
+ ]);
+ $integrationData = $this->createFormIntegration('email', $form->id, [
+ 'send_to' => $user->email,
+ 'sender_name' => 'OpnForm',
+ 'subject' => 'New form submission',
+ 'email_content' => 'Hello there πŸ‘‹ <br>Test body',
+ 'include_submission_data' => true,
+ 'include_hidden_fields_submission_data' => false,
+ 'reply_to' => '[email protected]',
+ 'link_edit_submission' => false,
+ ]);
+
+ $formData = $this->generateFormSubmissionData($form);
+
+ $event = new \App\Events\Forms\FormSubmitted($form, $formData);
+ $mailable = new FormEmailNotification($event, $integrationData, 'mail');
+ $notifiable = new AnonymousNotifiable();
+ $notifiable->route('mail', $user->email);
+ $renderedMail = $mailable->toMail($notifiable);
+ expect($renderedMail->subject)->toBe('New form submission');
+ expect($renderedMail->replyTo[0][0])->toBe('[email protected]');
+ expect(trim($renderedMail->render()))->toContain('Test body');
+ expect(trim($renderedMail->render()))->not->toContain('Edit submission');
+});
diff --git a/client/components/open/integrations/EmailIntegration.vue b/client/components/open/integrations/EmailIntegration.vue
index 7de9aa924..635c476d0 100644
--- a/client/components/open/integrations/EmailIntegration.vue
+++ b/client/components/open/integrations/EmailIntegration.vue
@@ -83,9 +83,17 @@
label="Include hidden fields"
help="If enabled the email will contain hidden fields"
/>
+ <toggle-switch-input
+ v-if="form.editable_submissions"
+ :form="integrationData"
+ name="settings.link_edit_submission"
+ class="mt-4"
+ label="Edit Submission Link"
+ />
<MentionInput
:form="integrationData"
:mentions="form.properties"
+ class="mt-4"
name="settings.reply_to"
label="Reply To"
help="If empty, Reply-to will be your own email."
diff --git a/client/components/open/integrations/components/NotificationsMessageActions.vue b/client/components/open/integrations/components/NotificationsMessageActions.vue
index 4d45dde2b..3235ffac8 100644
--- a/client/components/open/integrations/components/NotificationsMessageActions.vue
+++ b/client/components/open/integrations/components/NotificationsMessageActions.vue
@@ -45,6 +45,7 @@
help="Form views and submissions count"
/>
<toggle-switch-input
+ v-if="form.editable_submissions"
v-model="compVal.link_edit_submission"
name="link_edit_submission"
class="mt-4"