diff --git a/.gitignore b/.gitignore index 4026fb22467..b26b4b107b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea .vscode +*.code-workspace /vendor node_modules .DS_Store diff --git a/lang/en/messages.php b/lang/en/messages.php index f4609a3aaf8..0f8fe56ad41 100644 --- a/lang/en/messages.php +++ b/lang/en/messages.php @@ -85,7 +85,7 @@ 'elevated_session_verification_code_sent' => 'Verification code has been sent to your email.', 'email_connection_delete_confirmation' => 'Are you sure you want to delete this email?', 'email_connection_description' => 'Send email notifications.', - 'email_connection_empty_description' => 'Notify your team, or send a confirmation to the person who submitted.', + 'email_connection_empty_description' => 'Set up emails to be sent automatically when this form is submitted. Use them to notify users or team members.', 'email_utility_configuration_description' => 'Mail settings are configured in :path', 'email_utility_description' => 'Check email configuration settings and send test emails.', 'entry_count' => ':count entry|:count entries', @@ -329,7 +329,7 @@ 'user_wizard_super_admin_instructions' => 'Super admins have complete control and access to everything in the control panel. Grant this role wisely.', 'webhook_connection_delete_confirmation' => 'Are you sure you want to delete this webhook?', 'webhook_connection_description' => 'Send submissions to an external URL.', - 'webhook_connection_empty_description' => 'Notify other services whenever this form receives a submission.', + 'webhook_connection_empty_description' => 'Each webhook is sent when this form is submitted. Notify other services or trigger automations with the submission data.', 'webhook_connection_payload_instructions' => 'Each submission is sent to the webhook URL as a JSON POST request.', 'webhook_connection_verify_ssl_instructions' => 'Only disable this if the receiving server uses a self-signed certificate.', 'width_x_height' => ':width × :height', diff --git a/packages/cms/src/index.js b/packages/cms/src/index.js index ec6357d4ac5..1f503006a74 100644 --- a/packages/cms/src/index.js +++ b/packages/cms/src/index.js @@ -18,6 +18,7 @@ export const { SortableList, ConnectionRows, ConnectionRules, + ConditionsCollapsedSummary, conditionsSummary, requireElevatedSession, requireElevatedSessionIf, diff --git a/resources/js/bootstrap/cms/core.js b/resources/js/bootstrap/cms/core.js index fa838f33f0a..494ba737225 100644 --- a/resources/js/bootstrap/cms/core.js +++ b/resources/js/bootstrap/cms/core.js @@ -21,3 +21,4 @@ export { default as clone, deepClone } from '../../util/clone.js'; export { default as debounce } from '../../util/debounce.js'; export { default as ConnectionRows } from '../../components/forms/connections/ConnectionRows.vue'; export { default as ConnectionRules, conditionsSummary } from '../../components/forms/connections/ConnectionRules.vue'; +export { default as ConditionsCollapsedSummary } from '../../components/forms/connections/ConditionsCollapsedSummary.vue'; diff --git a/resources/js/components/forms/connections/ConditionsCollapsedSummary.vue b/resources/js/components/forms/connections/ConditionsCollapsedSummary.vue new file mode 100644 index 00000000000..3dcdde55267 --- /dev/null +++ b/resources/js/components/forms/connections/ConditionsCollapsedSummary.vue @@ -0,0 +1,135 @@ + + + diff --git a/resources/js/components/forms/connections/ConnectionRow.vue b/resources/js/components/forms/connections/ConnectionRow.vue index 14d51866351..944eaaf476a 100644 --- a/resources/js/components/forms/connections/ConnectionRow.vue +++ b/resources/js/components/forms/connections/ConnectionRow.vue @@ -21,10 +21,10 @@ function toggleCollapsedState() { :class="{ 'border-red-500': hasError }" >
diff --git a/resources/js/components/forms/connections/ConnectionRows.vue b/resources/js/components/forms/connections/ConnectionRows.vue index 5120c9781fd..aa209db2c39 100644 --- a/resources/js/components/forms/connections/ConnectionRows.vue +++ b/resources/js/components/forms/connections/ConnectionRows.vue @@ -1,9 +1,10 @@