Merge pull request #2323 from suraj-webkul/issue#2294

issue #2294 has been fixed.

Author: VikassWebkul214254

packages/Webkul/Admin/src/Resources/views/settings/workflows/create.blade.php

@@ -283,8 +283,8 @@ class="flex flex-col gap-4"
                             </p>
                         </div>
 
-                        <div class="block w-full overflow-x-auto">
-                            <x-admin::table class="!w-1/2">
+                        <div class="block w-full">
+                            <x-admin::table class="!w-1/2 !table-auto">
                                 <!-- Table Head -->
                                 <x-admin::table.thead>
                                     <x-admin::table.thead.tr>
@@ -339,7 +339,7 @@ class="text-md flex max-w-max items-center gap-2 text-brandColor"
             type="text/x-template"
             id="v-workflow-condition-item-template"
         >
-            <div class="flex justify-between gap-4">
+            <div class="flex items-center justify-between gap-4">
                 <div class="flex flex-1 gap-4 max-sm:flex-1 max-sm:flex-wrap">
                     <!-- Select main condition. -->
                     <select
@@ -490,11 +490,15 @@ class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1
                             <template v-else>
                                 <div class="w-1/3">
                                     <v-lookup-component
-                                        :attribute="{'code': 'conditions[' + index + '][value]', 'name': 'Email', 'lookup_type': matchedAttribute.lookup_type}"
-                                        validations="required|email"
-                                        :data="condition.value"
+                                        :attribute="{'code': 'conditions[' + index + '][value]', 'name': matchedAttribute?.name, 'lookup_type': matchedAttribute.lookup_type}"
+                                        validations="required"
+                                        :value="{
+                                            id: condition.value
+                                        }"
                                         can-add-new="true"
                                     ></v-lookup-component>
+
+                                    <x-admin::form.control-group.error ::name="`conditions[${index}][value]`"/>
                                 </div>
                             </template>
                         </template>
@@ -726,11 +730,15 @@ class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-
                                     <template v-else>
                                         <div class="w-full">
                                             <v-lookup-component
-                                                :attribute="{'code': 'actions[' + index + '][value]', 'name': 'Email', 'lookup_type': matchedAttribute.lookup_type}"
-                                                validations="required|email"
-                                                :data="action.value"
+                                                :attribute="{'code': 'actions[' + index + '][value]', 'name': matchedAttribute?.name, 'lookup_type': matchedAttribute.lookup_type}"
+                                                validations="required"
+                                                :value="{
+                                                    id: action.value
+                                                }"
                                                 can-add-new="true"
                                             ></v-lookup-component>
+
+                                            <x-admin::form.control-group.error ::name="`actions[${index}][value]`"/>
                                         </div>
                                     </template>
                                 </template>

packages/Webkul/Admin/src/Resources/views/settings/workflows/edit.blade.php

@@ -112,6 +112,7 @@ class="flex flex-col gap-4"
                                     :label="trans('admin::app.settings.workflows.edit.name')"
                                     :placeholder="trans('admin::app.settings.workflows.edit.name')"
                                 />
+
                                 <x-admin::form.control-group.error control-name="name" />
                             </x-admin::form.control-group>
 
@@ -287,7 +288,7 @@ class="flex flex-col gap-4"
                             </p>
                         </div>
 
-                        <div class="block w-full overflow-x-auto">
+                        <div class="block w-full">
                             <x-admin::table class="!w-1/2 !table-auto">
                                 <!-- Table Head -->
                                 <x-admin::table.thead>
@@ -494,11 +495,15 @@ class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1
                             <template v-else>
                                 <div class="w-1/3">
                                     <v-lookup-component
-                                        :attribute="{'code': 'conditions[' + index + '][value]', 'name': 'Email', 'lookup_type': matchedAttribute.lookup_type}"
-                                        validations="required|email"
-                                        :data="condition.value"
+                                        :attribute="{'code': 'conditions[' + index + '][value]', 'name': matchedAttribute?.name, 'lookup_type': matchedAttribute.lookup_type}"
+                                        validations="required"
+                                        :value="{
+                                            id: condition.value
+                                        }"
                                         can-add-new="true"
                                     ></v-lookup-component>
+
+                                    <x-admin::form.control-group.error ::name="`conditions[${index}][value]`"/>
                                 </div>
                             </template>
                         </template>
@@ -731,11 +736,15 @@ class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-
                                         <template v-else>
                                             <div class="w-full">
                                                 <v-lookup-component
-                                                    :attribute="{'code': 'actions[' + index + '][value]', 'name': 'Email', 'lookup_type': matchedAttribute.lookup_type}"
-                                                    validations="required|email"
-                                                    :data="action.value"
+                                                    :attribute="{'code': 'actions[' + index + '][value]', 'name': matchedAttribute?.name, 'lookup_type': matchedAttribute.lookup_type}"
+                                                    validations="required"
+                                                    :value="{
+                                                        id: action.value
+                                                    }"
                                                     can-add-new="true"
                                                 ></v-lookup-component>
+
+                                                <x-admin::form.control-group.error ::name="`actions[${index}][value]`"/>
                                             </div>
                                         </template>
                                     </template>