diff --git a/frontend/src/webparts/approvalAdmin/components/screens/RequestTypeAccessScreen.tsx b/frontend/src/webparts/approvalAdmin/components/screens/RequestTypeAccessScreen.tsx index d3e5f8d..67ef86d 100644 --- a/frontend/src/webparts/approvalAdmin/components/screens/RequestTypeAccessScreen.tsx +++ b/frontend/src/webparts/approvalAdmin/components/screens/RequestTypeAccessScreen.tsx @@ -26,8 +26,7 @@ import { PageHeader, PrimaryCell, SearchableSelect, - Select, - TextInput + Select } from '../ui'; export interface IRequestTypeAccessScreenProps { @@ -84,7 +83,7 @@ export const RequestTypeAccessScreen: React.FC = const filteredItems = access.items.filter(item => { if (filterRequestTypeId && String(item.requestTypeId) !== filterRequestTypeId) return false; - if (filterEmail && item.email.toLowerCase().indexOf(filterEmail.trim().toLowerCase()) === -1) return false; + if (filterEmail && item.email.toLowerCase() !== filterEmail.toLowerCase()) return false; return true; }); @@ -143,10 +142,16 @@ export const RequestTypeAccessScreen: React.FC =
- setFilterEmail(e.target.value)} + loading={employees.isLoading} + allowClear + clearLabel={texts.requestTypeAccess.filterEmailAll} placeholder={texts.requestTypeAccess.filterEmailPlaceholder} + searchPlaceholder={texts.select.employeeSearchPlaceholder} + emptyMessage={texts.select.employeesEmpty} + onChange={setFilterEmail} />
diff --git a/frontend/src/webparts/approvalAdmin/texts.ts b/frontend/src/webparts/approvalAdmin/texts.ts index 93020ca..b6048f2 100644 --- a/frontend/src/webparts/approvalAdmin/texts.ts +++ b/frontend/src/webparts/approvalAdmin/texts.ts @@ -189,7 +189,8 @@ export const texts = { filterRequestTypeLabel: 'Фильтр по типу заявки', filterRequestTypeAll: 'Все типы заявок', filterEmailLabel: 'Фильтр по сотруднику', - filterEmailPlaceholder: 'Email сотрудника', + filterEmailAll: 'Все сотрудники', + filterEmailPlaceholder: 'Найдите по ФИО или email', columnRequestType: 'Тип заявки', columnEmail: 'Сотрудник', columnSharePointLists: 'Списки SharePoint (выдать доступ вручную)',