From 5d9135dacf89e3a1a39b1b66d5a0d54ba72217ec Mon Sep 17 00:00:00 2001
From: Kelani Tolulope <kelanik8@gmail.com>
Date: Fri, 21 Jul 2023 17:18:57 +0100
Subject: [PATCH] Align module field label with delete button on bulk edit
 modal

---
 .../src/components/ModuleFields/Editor/Bool.vue |  2 ++
 .../components/ModuleFields/Editor/DateTime.vue |  2 ++
 .../components/ModuleFields/Editor/Email.vue    |  2 ++
 .../src/components/ModuleFields/Editor/File.vue |  2 ++
 .../components/ModuleFields/Editor/Geometry.vue |  2 ++
 .../components/ModuleFields/Editor/Number.vue   |  2 ++
 .../components/ModuleFields/Editor/Record.vue   |  2 ++
 .../components/ModuleFields/Editor/Select.vue   |  2 ++
 .../components/ModuleFields/Editor/String.vue   |  2 ++
 .../src/components/ModuleFields/Editor/Url.vue  |  2 ++
 .../src/components/ModuleFields/Editor/User.vue |  2 ++
 .../components/ModuleFields/Editor/index.vue    |  1 +
 .../components/Public/Record/BulkEdit/index.vue | 17 +++++++++--------
 13 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/client/web/compose/src/components/ModuleFields/Editor/Bool.vue b/client/web/compose/src/components/ModuleFields/Editor/Bool.vue
index e8f801beb..0d5362f13 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Bool.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Bool.vue
@@ -25,6 +25,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/DateTime.vue b/client/web/compose/src/components/ModuleFields/Editor/DateTime.vue
index 9aa58603b..f07b9d8c2 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/DateTime.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/DateTime.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Email.vue b/client/web/compose/src/components/ModuleFields/Editor/Email.vue
index 33dc90766..b54ce3849 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Email.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Email.vue
@@ -25,6 +25,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/File.vue b/client/web/compose/src/components/ModuleFields/Editor/File.vue
index 620dde933..8c5cdd4f9 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/File.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/File.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Geometry.vue b/client/web/compose/src/components/ModuleFields/Editor/Geometry.vue
index 6954ff8e8..42290ebb0 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Geometry.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Geometry.vue
@@ -25,6 +25,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Number.vue b/client/web/compose/src/components/ModuleFields/Editor/Number.vue
index a9868ab3b..15ec2e478 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Number.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Number.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Record.vue b/client/web/compose/src/components/ModuleFields/Editor/Record.vue
index e87584606..8107244a5 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Record.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Record.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Select.vue b/client/web/compose/src/components/ModuleFields/Editor/Select.vue
index 147aec22b..3829e7a1f 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Select.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Select.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/String.vue b/client/web/compose/src/components/ModuleFields/Editor/String.vue
index 6935e61c3..729e29ab8 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/String.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/String.vue
@@ -25,6 +25,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/Url.vue b/client/web/compose/src/components/ModuleFields/Editor/Url.vue
index dc909fdbb..163477240 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Url.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Url.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/User.vue b/client/web/compose/src/components/ModuleFields/Editor/User.vue
index ab7481013..a93559824 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/User.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/User.vue
@@ -24,6 +24,8 @@
           :id="field.fieldID"
           :text="hint"
         />
+
+        <slot name="tools" />
       </div>
       <div
         class="small text-muted"
diff --git a/client/web/compose/src/components/ModuleFields/Editor/index.vue b/client/web/compose/src/components/ModuleFields/Editor/index.vue
index f27bb67b4..799159826 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/index.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/index.vue
@@ -34,6 +34,7 @@ export default {
       return createElement(cmp, {
         props: this.$props,
         on: this.$listeners,
+        scopedSlots: this.$scopedSlots,
       })
     } else {
       return createElement('code', this.$t('field.unknownFieldKind', { kind: this.field.kind }))
diff --git a/client/web/compose/src/components/Public/Record/BulkEdit/index.vue b/client/web/compose/src/components/Public/Record/BulkEdit/index.vue
index 8293ebc97..5bc53ba92 100644
--- a/client/web/compose/src/components/Public/Record/BulkEdit/index.vue
+++ b/client/web/compose/src/components/Public/Record/BulkEdit/index.vue
@@ -37,14 +37,15 @@
             :field="getField(field)"
             :errors="fieldErrors(field)"
             :record="record"
-          />
-
-          <c-input-confirm
-            class="position-absolute"
-            :tooltip="$t('recordList.bulkRecord.field.remove')"
-            style="top: -2px; right: -4.5px; z-index: 2;"
-            @confirmed="fields.splice(index, 1)"
-          />
+          >
+            <template #tools>
+              <c-input-confirm
+                class="ml-2"
+                :tooltip="$t('recordList.bulkRecord.field.remove')"
+                @confirmed="fields.splice(index, 1)"
+              />
+            </template>
+          </field-editor>
         </div>
       </b-card>