From ca159804f929b40f74674ec5a18272d42e97af7b Mon Sep 17 00:00:00 2001
From: Julien Nahum <julien@nahum.net>
Date: Mon, 27 May 2024 11:27:46 +0200
Subject: [PATCH] Simplify syntax of InputHelp

---
 .../components/forms/components/InputHelp.vue |  4 +--
 .../open/integrations/DiscordIntegration.vue  | 30 +++++++++----------
 .../open/integrations/SlackIntegration.vue    | 22 +++++++-------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/client/components/forms/components/InputHelp.vue b/client/components/forms/components/InputHelp.vue
index a8e98cf4..dd0db176 100644
--- a/client/components/forms/components/InputHelp.vue
+++ b/client/components/forms/components/InputHelp.vue
@@ -7,7 +7,7 @@
       :class="helpClasses"
       class="grow flex"
     >
-      <slot name="help">
+      <slot>
         <span
           v-if="help"
           class="field-help"
@@ -29,6 +29,6 @@ const props = defineProps({
 })
 
 const shouldRender = computed(() => {
-  return props.help || !!slots.help || !!slots['after-help']
+  return props.help || !!slots.default || !!slots['after-help']
 })
 </script>
diff --git a/client/components/open/integrations/DiscordIntegration.vue b/client/components/open/integrations/DiscordIntegration.vue
index 55fcba2c..37da2ac2 100644
--- a/client/components/open/integrations/DiscordIntegration.vue
+++ b/client/components/open/integrations/DiscordIntegration.vue
@@ -13,18 +13,16 @@
     >
       <template #help>
         <InputHelp>
-          <template #help>
-            <span>
-              Receive a discord message on each form submission.
-              <a
-                href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"
-                target="_blank"
-              >
-                Click here
-              </a>
-              to learn how to get a discord webhook url.
-            </span>
-          </template>
+          <span>
+            Receive a discord message on each form submission.
+            <a
+              href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"
+              target="_blank"
+            >
+              Click here
+            </a>
+            to learn how to get a discord webhook url.
+          </span>
         </InputHelp>
       </template>
     </text-input>
@@ -40,9 +38,9 @@ import IntegrationWrapper from "./components/IntegrationWrapper.vue"
 import NotificationsMessageActions from "./components/NotificationsMessageActions.vue"
 
 const props = defineProps({
-  integration: { type: Object, required: true },
-  form: { type: Object, required: true },
-  integrationData: { type: Object, required: true },
-  formIntegrationId: { type: Number, required: false, default: null },
+  integration: {type: Object, required: true},
+  form: {type: Object, required: true},
+  integrationData: {type: Object, required: true},
+  formIntegrationId: {type: Number, required: false, default: null},
 })
 </script>
diff --git a/client/components/open/integrations/SlackIntegration.vue b/client/components/open/integrations/SlackIntegration.vue
index ec43649a..7bbb7248 100644
--- a/client/components/open/integrations/SlackIntegration.vue
+++ b/client/components/open/integrations/SlackIntegration.vue
@@ -13,18 +13,16 @@
     >
       <template #help>
         <InputHelp>
-          <template #help>
-            <span>
-              Receive slack message on each form submission.
-              <a
-                href="https://api.slack.com/messaging/webhooks"
-                target="_blank"
-              >
-                Click here
-              </a>
-              to learn how to get a slack webhook url
-            </span>
-          </template>
+          <span>
+            Receive slack message on each form submission.
+            <a
+              href="https://api.slack.com/messaging/webhooks"
+              target="_blank"
+            >
+              Click here
+            </a>
+            to learn how to get a slack webhook url
+          </span>
         </InputHelp>
       </template>
     </text-input>