From 482e59e1bb9a0a9bbfd65157f21542e02ad4e435 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Mon, 17 Feb 2025 09:17:42 -0100
Subject: [PATCH] Bug 38201: DRY label in FormElement

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/js/vue/components/FormElement.vue    | 66 ++-----------------
 1 file changed, 7 insertions(+), 59 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
index 8bd4448278..42568ead1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
@@ -1,11 +1,12 @@
 <template>
+    <label
+        v-if="attr.label"
+        :for="`${attr.name}${index}`"
+        :class="{ required: attr.required }"
+        :style="{ ...attr.style }"
+        >{{ attr.label }}:</label
+    >
     <template v-if="attr.type == 'number'">
-        <label
-            :for="`${attr.name}${index}`"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <input
             :id="`${attr.name}${index}`"
             type="number"
@@ -15,12 +16,6 @@
         />
     </template>
     <template v-if="attr.type == 'text'">
-        <label
-            :for="`${attr.name}${index}`"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <input
             :id="`${attr.name}${index}`"
             v-model="resource[attr.name]"
@@ -29,12 +24,6 @@
         />
     </template>
     <template v-else-if="attr.type == 'textarea'">
-        <label
-            :for="`${attr.name}${index}`"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <textarea
             :id="`${attr.name}${index}`"
             v-model="resource[attr.name]"
@@ -45,12 +34,6 @@
         />
     </template>
     <template v-else-if="attr.type == 'checkbox'">
-        <label
-            :for="`${attr.name}${index}`"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <input
             type="checkbox"
             :id="`${attr.name}${index}`"
@@ -59,7 +42,6 @@
         />
     </template>
     <template v-else-if="attr.type == 'boolean'">
-        <label :for="`${attr.name}${index}`">{{ attr.label }}:</label>
         <label class="radio" :for="`${attr.name}${index}` + '_yes'"
             >{{ $__("Yes") }}:
             <input
@@ -82,12 +64,6 @@
         </label>
     </template>
     <template v-else-if="attr.type == 'select'">
-        <label
-            :for="`${attr.name}${index}`"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <v-select
             :id="`${attr.name}${index}`"
             v-model="resource[attr.name]"
@@ -110,13 +86,6 @@
         </v-select>
     </template>
     <template v-else-if="attr.type == 'vendor'">
-        <label
-            v-if="attr.label"
-            :for="attr.name"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <component
             :is="requiredComponent"
             :id="attr.name"
@@ -126,13 +95,6 @@
         ></component>
     </template>
     <template v-else-if="attr.type == 'date'">
-        <label
-            v-if="attr.label"
-            :for="attr.name"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <component
             :is="requiredComponent"
             :id="attr.name"
@@ -142,13 +104,6 @@
         ></component>
     </template>
     <template v-else-if="attr.type == 'component' && attr.componentPath">
-        <label
-            v-if="attr.label"
-            :for="attr.name"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <component
             v-if="isVModelRequired(attr.componentPath)"
             :is="requiredComponent"
@@ -176,13 +131,6 @@
         ></component>
     </template>
     <template v-else-if="attr.type == 'relationshipSelect'">
-        <label
-            v-if="attr.label"
-            :for="attr.name"
-            :class="{ required: attr.required }"
-            :style="{ ...attr.style }"
-            >{{ attr.label }}:</label
-        >
         <FormRelationshipSelect
             v-bind="attr"
             :resource="resource"