Merge pull request #1571 from suraj-webkul/fix-lookup-component

fix lookup component and add Convert empty string to null middleware.

Author: jitendra-webkul

packages/Webkul/Admin/src/Http/Controllers/Lead/LeadController.php

@@ -171,6 +171,8 @@ public function store(LeadForm $request): RedirectResponse
             $data['closed_at'] = Carbon::now();
         }
 
+        $data['person']['organization_id'] = empty($data['person']['organization_id']) ? null : $data['person']['organization_id'];
+
         $lead = $this->leadRepository->create($data);
 
         Event::dispatch('lead.create.after', $lead);
@@ -230,6 +232,8 @@ public function update(LeadForm $request, int $id): RedirectResponse|JsonRespons
             $data['lead_pipeline_stage_id'] = $stage->id;
         }
 
+        $data['person']['organization_id'] = empty($data['person']['organization_id']) ? null : $data['person']['organization_id'];
+
         $lead = $this->leadRepository->update($data, $id);
 
         Event::dispatch('lead.update.after', $lead);

packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php

@@ -131,24 +131,16 @@ class="px-4 py-2 text-center text-gray-500"
                 };
             },
 
+            mounted() {
+                if (this.value) {
+                    this.selectedItem = this.value;
+                }
+            },
 
             watch: { 
-                value(newValue, oldValue) {
-                    if (
-                        JSON.stringify(newValue) 
-                        !== JSON.stringify(oldValue)
-                    ) {
-                        this.searchTerm = newValue ? newValue['name'] : '';
-
-                        this.entityId = newValue ? newValue['id'] : '';
-
-                        if (this.searchTerm == '') {
-                            this.remove();
-                        } else {
-                            this.getLookUpEntity();
-                        }
-                    }
-                }
+                searchTerm(newVal, oldVal) {
+                    this.search();
+                },
             },
 
             mounted() {
@@ -235,8 +227,8 @@ class="px-4 py-2 text-center text-gray-500"
                     this.searchedResults = [];
 
                     this.$emit('lookup-removed');
-                }
-            }
+                },
+            },
         });
     </script>
 @endPushOnce

packages/Webkul/Admin/src/Resources/views/components/lookup/index.blade.php

@@ -177,8 +177,6 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
                 if (this.value) {
                     this.selectedItem = this.value;
                 }
-
-                console.log(this.selectedItem?.name == "");
             },
 
             created() {