From 9ec1fbd714bc6e220cfbdb50cc7d40a120738fb0 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Mon, 18 Mar 2024 18:24:00 +0100
Subject: [PATCH] fix: ConfigPanels event bubbling

---
 app/src/components/ConfigPanel.vue          | 2 +-
 app/src/components/ConfigPanels.vue         | 1 -
 app/src/components/RoutableTabs.vue         | 6 +-----
 app/src/components/globals/AbstractForm.vue | 5 +++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/components/ConfigPanel.vue b/app/src/components/ConfigPanel.vue
index 6220a608..4121ab61 100644
--- a/app/src/components/ConfigPanel.vue
+++ b/app/src/components/ConfigPanel.vue
@@ -6,7 +6,7 @@
       validation,
       serverError: panel.serverError,
     }"
-    @apply="onApply"
+    @submit="onApply"
     :no-footer="!panel.hasApplyButton"
   >
     <slot name="tab-top" />
diff --git a/app/src/components/ConfigPanels.vue b/app/src/components/ConfigPanels.vue
index b1869b31..82d6abda 100644
--- a/app/src/components/ConfigPanels.vue
+++ b/app/src/components/ConfigPanels.vue
@@ -5,7 +5,6 @@
       v-if="routes_.length > 1"
       v-bind="{ panels, forms, v: v$, ...$attrs }"
       :routes="routes_"
-      @apply="$emit('apply', $event)"
     >
       <template #tab-top>
         <slot name="tab-top" />
diff --git a/app/src/components/RoutableTabs.vue b/app/src/components/RoutableTabs.vue
index 1fa13bbe..193810c4 100644
--- a/app/src/components/RoutableTabs.vue
+++ b/app/src/components/RoutableTabs.vue
@@ -16,11 +16,7 @@
 
     <!-- Bind extra props to the child view and forward child events to parent -->
     <RouterView v-slot="{ Component }">
-      <Component
-        v-bind="$attrs"
-        :is="Component"
-        @apply="$emit('apply', $event)"
-      >
+      <Component v-bind="$attrs" :is="Component">
         <template #tab-top>
           <slot name="tab-top" />
         </template>
diff --git a/app/src/components/globals/AbstractForm.vue b/app/src/components/globals/AbstractForm.vue
index 273073ca..ed7581b5 100644
--- a/app/src/components/globals/AbstractForm.vue
+++ b/app/src/components/globals/AbstractForm.vue
@@ -34,6 +34,8 @@
 export default {
   name: 'AbstractForm',
 
+  inheritAttrs: false,
+
   props: {
     id: { type: String, default: 'ynh-form' },
     submitText: { type: String, default: null },
@@ -60,8 +62,7 @@ export default {
         v.$touch()
         if (v.$pending || v.$errors.length) return
       }
-      // Weird bug with `INSTANCE_LISTENERS: true` with 'submit' event (double exec before of conflict with native submit event?)
-      this.$emit('apply')
+      this.$emit('submit')
     },
   },
 }