fabritsky/corp-address-book
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve email saving issue and implement email substring search

Browse Source
This commit is contained in:
fabritsky
2026-05-28 08:01:43 +07:00
parent 9d83a74769
commit 29308d756a
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/App.jsx
+4 -1
View File
@@ -147,7 +147,10 @@ const App = () => {
const deptMatch = emp.department_name && emp.department_name.toLowerCase().includes(queryClean);
const buildingMatch = emp.building && emp.building.toLowerCase().includes(queryClean);
return nameMatch || phoneMatch || internalPhoneMatch || internalPhoneStringMatch || titleMatch || companyMatch || deptMatch || buildingMatch;
// Match email fragment (by start, middle, domain, part before @)
const emailMatch = emp.email && emp.email.toLowerCase().includes(queryClean);
return nameMatch || phoneMatch || internalPhoneMatch || internalPhoneStringMatch || titleMatch || companyMatch || deptMatch || buildingMatch || emailMatch;
}
return true;
frontend/src/components/AdminPanel.jsx
+21 -6
View File
@@ -305,12 +305,27 @@ const AdminPanel = ({ token, employees, departments, companies, onRefreshData })
};
// Filter employees within the admin table
const filteredEmployees = employees.filter(emp =>
emp.name.toLowerCase().includes(adminSearch.toLowerCase()) ||
emp.job_title.toLowerCase().includes(adminSearch.toLowerCase()) ||
(emp.company_name && emp.company_name.toLowerCase().includes(adminSearch.toLowerCase())) ||
(emp.department_name && emp.department_name.toLowerCase().includes(adminSearch.toLowerCase()))
);
const filteredEmployees = employees.filter(emp => {
const cleanSearch = adminSearch.toLowerCase().trim();
if (!cleanSearch) return true;
const nameMatch = emp.name.toLowerCase().includes(cleanSearch);
const jobMatch = emp.job_title.toLowerCase().includes(cleanSearch);
const companyMatch = emp.company_name && emp.company_name.toLowerCase().includes(cleanSearch);
const deptMatch = emp.department_name && emp.department_name.toLowerCase().includes(cleanSearch);
const emailMatch = emp.email && emp.email.toLowerCase().includes(cleanSearch);
// Normalize phone numbers for search
const cleanDigits = cleanSearch.replace(/\D/g, '');
const empPhoneDigits = emp.phone ? emp.phone.replace(/\D/g, '') : '';
const phoneMatch = cleanDigits.length > 0 && empPhoneDigits.includes(cleanDigits);
const empInternalPhoneDigits = emp.internal_phone ? emp.internal_phone.replace(/\D/g, '') : '';
const internalPhoneMatch = cleanDigits.length > 0 && empInternalPhoneDigits.includes(cleanDigits);
const internalPhoneStringMatch = emp.internal_phone && emp.internal_phone.toLowerCase().includes(cleanSearch);
return nameMatch || jobMatch || companyMatch || deptMatch || emailMatch || phoneMatch || internalPhoneMatch || internalPhoneStringMatch;
});
return (
<div className="admin-layout">