Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

On slack,discord add support for Include hidden fields #654

Merged
merged 1 commit into from
Dec 30, 2024
Merged

On slack,discord add support for Include hidden fields #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion api/app/Integrations/Handlers/DiscordIntegration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public static function getValidationRules(?Form $form): array
return [
'discord_webhook_url' => 'required|url|starts_with:https://discord.com/api/webhooks',
'include_submission_data' => 'boolean',
'include_hidden_fields_submission_data' => ['nullable', 'boolean'],
'link_open_form' => 'boolean',
'link_edit_form' => 'boolean',
'views_submissions_count' => 'boolean',
Expand All @@ -34,10 +35,14 @@ protected function shouldRun(): bool

protected function getWebhookData(): array
{
$settings = (array) $this->integrationData ?? [];

$formatter = (new FormSubmissionFormatter($this->form, $this->submissionData))->outputStringsOnly();
if (Arr::get($settings, 'include_hidden_fields_submission_data', false)) {
$formatter->showHiddenFields();
}
$formattedData = $formatter->getFieldsWithValue();

$settings = (array) $this->integrationData ?? [];
$externalLinks = [];
if (Arr::get($settings, 'link_open_form', true)) {
$externalLinks[] = '[**🔗 Open Form**](' . $this->form->share_url . ')';
Expand Down
7 changes: 6 additions & 1 deletion api/app/Integrations/Handlers/SlackIntegration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public static function getValidationRules(?Form $form): array
return [
'slack_webhook_url' => 'required|url|starts_with:https://hooks.slack.com/',
'include_submission_data' => 'boolean',
'include_hidden_fields_submission_data' => ['nullable', 'boolean'],
'link_open_form' => 'boolean',
'link_edit_form' => 'boolean',
'views_submissions_count' => 'boolean',
Expand All @@ -34,10 +35,14 @@ protected function shouldRun(): bool

protected function getWebhookData(): array
{
$settings = (array) $this->integrationData ?? [];

$formatter = (new FormSubmissionFormatter($this->form, $this->submissionData))->outputStringsOnly();
if (Arr::get($settings, 'include_hidden_fields_submission_data', false)) {
$formatter->showHiddenFields();
}
$formattedData = $formatter->getFieldsWithValue();

$settings = (array) $this->integrationData ?? [];
$externalLinks = [];
if (Arr::get($settings, 'link_open_form', true)) {
$externalLinks[] = '*<' . $this->form->share_url . '|🔗 Open Form>*';
Expand Down
11 changes: 11 additions & 0 deletions client/components/open/integrations/components/NotificationsMessageActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
label="Include submission data"
help="With form submission answers"
/>
<toggle-switch-input
v-if="compVal.include_submission_data"
v-model="compVal.include_hidden_fields_submission_data"
name="include_hidden_fields_submission_data"
class="mt-4"
label="Include hidden fields"
help="If enabled then hidden fields will be included in the notification message"
/>
<toggle-switch-input
v-model="compVal.link_open_form"
name="link_open_form"
Expand Down Expand Up @@ -85,6 +93,7 @@ export default {
[
"message",
"include_submission_data",
'include_hidden_fields_submission_data',
"link_open_form",
"link_edit_form",
"views_submissions_count",
Expand All @@ -93,6 +102,8 @@ export default {
if (this.compVal[keyname] === undefined) {
if (keyname === 'message') {
this.compVal[keyname] = 'New form submission'
} else if (['include_hidden_fields_submission_data'].includes(keyname)) {
this.compVal[keyname] = false
} else {
this.compVal[keyname] = true
}
Expand Down
Loading