Merge branch '2.0'

Author: devansh-webkul

packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/tags.blade.php

@@ -18,8 +18,9 @@ class="flex flex-wrap items-center gap-1"
                 v-bind="$attrs"
             >
                 <li
-                    class="flex items-center gap-1 rounded-md bg-gray-100 dark:bg-gray-950 ltr:pl-2 rtl:pr-2"
                     v-for="(tag, index) in tags"
+                    :key="index"
+                    class="flex items-center gap-1 rounded-md bg-gray-100 dark:bg-gray-950 ltr:pl-2 rtl:pr-2"
                 >
                     <x-admin::form.control-group.control
                         type="hidden"
@@ -40,7 +41,7 @@ class="icon-cross-large cursor-pointer p-0.5 text-xl"
                         v-slot="{ field, errors }"
                         :name="'temp-' + name"
                         v-model="input"
-                        :rules="inputRules"
+                        :rules="tags.length ? inputRules : [inputRules, rules].filter(Boolean).join('|')"
                         :label="label"
                     >
                         <input
@@ -61,7 +62,7 @@ class="w-full dark:!bg-gray-900"
                             v-slot="{ field, errors }"
                             :name="name + '[' + 0 +']'"
                             :value="input"
-                            :rules="rules"
+                            :rules="inputRules"
                             :label="label"
                         >
                             <input
@@ -133,7 +134,7 @@ class="mt-1 text-xs italic text-red-600"
                 },
             },
 
-            data: function () {
+            data() {
                 return {
                     tags: this.data ? this.data : [],
 
@@ -142,7 +143,7 @@ class="mt-1 text-xs italic text-red-600"
             },
 
             methods: {
-                addTag: function() {
+                addTag() {
                     if (this.errors['temp-' + this.name]) {
                         return;
                     }

packages/Webkul/Admin/src/Resources/views/mail/index.blade.php

@@ -401,7 +401,8 @@ class="break-words text-slate-900 dark:text-white"
                                     <x-admin::form.control-group.controls.tags
                                         name="reply_to"
                                         class="w-[calc(100%-62px)]"
-                                        input-rules="email|required"
+                                        input-rules="email"
+                                        rules="required"
                                         ::data="draft.reply_to"
                                         :label="trans('admin::app.mail.index.mail.to')"
                                         :placeholder="trans('admin::app.mail.index.mail.enter-emails')"

packages/Webkul/Admin/src/Resources/views/mail/view.blade.php

@@ -377,8 +377,8 @@ class="flex cursor-pointer items-center gap-2 text-brandColor"
                                         <div class="relative">
                                             <x-admin::form.control-group.controls.tags
                                                 name="reply_to"
-                                                rules="required"
                                                 input-rules="email"
+                                                rules="required"
                                                 ::data="reply_to"
                                                 :label="trans('admin::app.mail.view.to')"
                                                 :placeholder="trans('admin::app.mail.view.enter-mails')"