diff --git a/client/src/components/employees/ExternalEmployeesImport.js b/client/src/components/employees/ExternalEmployeesImport.js index 0f0ff07..14216bf 100644 --- a/client/src/components/employees/ExternalEmployeesImport.js +++ b/client/src/components/employees/ExternalEmployeesImport.js @@ -8,15 +8,16 @@ const SYSTEM_ACCESS_PERMISSION = "System Access"; const ExternalEmployeesImport = () => { const navigate = useNavigate(); + const currentSite = EventsService.site || 3; const [loading, setLoading] = useState(false); const [saving, setSaving] = useState(false); const [employees, setEmployees] = useState([]); - const [siteFilter, setSiteFilter] = useState(EventsService.site || 3); + const [siteFilter, setSiteFilter] = useState(currentSite); const [keyword, setKeyword] = useState(""); const [showPermissionModal, setShowPermissionModal] = useState(false); const [selectedEmployee, setSelectedEmployee] = useState(undefined); const [selectedPermissions, setSelectedPermissions] = useState([SYSTEM_ACCESS_PERMISSION]); - const [selectedAllowSite, setSelectedAllowSite] = useState(EventsService.site || 3); + const [selectedAllowSite, setSelectedAllowSite] = useState(currentSite); useEffect(() => { if (!AuthService.canAddOrEditEmployees()) { @@ -57,9 +58,7 @@ const ExternalEmployeesImport = () => { }, [employees, siteFilter, keyword]); const openPermissionModal = (employee) => { - const allowSite = siteFilter === 'all' - ? (Number(employee?.site) || EventsService.site || 3) - : Number(siteFilter); + const allowSite = Number(currentSite); setSelectedEmployee(employee); setSelectedAllowSite(allowSite); setSelectedPermissions([SYSTEM_ACCESS_PERMISSION]); @@ -80,7 +79,7 @@ const ExternalEmployeesImport = () => { setShowPermissionModal(false); setSelectedEmployee(undefined); setSelectedPermissions([SYSTEM_ACCESS_PERMISSION]); - setSelectedAllowSite(EventsService.site || 3); + setSelectedAllowSite(currentSite); }; const togglePermission = (permissionKey) => {