From bb9c3511899e5d35ceaa91a55cc56c3431adc542 Mon Sep 17 00:00:00 2001 From: Kartik sharma Date: Mon, 30 Jun 2025 18:29:03 +0530 Subject: [PATCH] Changes in Search text. --- src/pages/employee/EmployeeList.jsx | 14 ++++++++++---- src/services/signalRService.js | 6 ++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 002f09d2..8066a2e2 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -67,9 +67,17 @@ const EmployeeList = () => { if (!text) { return data; } - const lowercasedText = text.toLowerCase(); + const lowercasedText = text.toLowerCase().trim(); // Ensure search text is trimmed and lowercase + return data.filter((item) => { - const fullName = `${item.firstName} ${item.middleName} ${item.lastName}`.toLowerCase(); + // **IMPROVED FULL NAME CONSTRUCTION** + const firstName = item.firstName || ""; + const middleName = item.middleName || ""; + const lastName = item.lastName || ""; + + // Join parts, then trim any excess spaces if a middle name is missing + const fullName = `${firstName} ${middleName} ${lastName}`.toLowerCase().trim().replace(/\s+/g, ' '); + const email = item.email ? item.email.toLowerCase() : ""; const phoneNumber = item.phoneNumber ? item.phoneNumber.toLowerCase() : ""; const jobRole = item.jobRole ? item.jobRole.toLowerCase() : ""; @@ -212,8 +220,6 @@ const handleAllEmployeesToggle = (e) => { } }; - - const handleEmployeeModel = (id) => { setSelecedEmployeeId(id); setShowModal(true); diff --git a/src/services/signalRService.js b/src/services/signalRService.js index 49ad0cc8..63cabc9c 100644 --- a/src/services/signalRService.js +++ b/src/services/signalRService.js @@ -70,7 +70,7 @@ export function startSignalR(loggedUser) { cacheData("hasReceived", false); eventBus.emit("assign_project_one", data); } catch (e) { - console.error("Error in cacheData:", e); + // console.error("Error in cacheData:", e); } } eventBus.emit("assign_project_all", data); @@ -96,9 +96,7 @@ export function startSignalR(loggedUser) { }); connection - .start() - .then(() => console.log("SignalR connected")) - .catch((err) => console.error("SignalR error:", err)); + .start(); } export function stopSignalR() {