Compare commits

2 Commits

2 changed files with 2 additions and 6 deletions

View File

@@ -121,11 +121,7 @@ const FilePicker = () => {
const verifyCsv = ({ data, meta, errors }: ParseResult<ImportLine>, { setValues, setStats, setError }) => { const verifyCsv = ({ data, meta, errors }: ParseResult<ImportLine>, { setValues, setStats, setError }) => {
/* First, verify the presence of required fields */ /* First, verify the presence of required fields */
const missingFields = expectedFields.filter(eF => { const missingFields = expectedFields.filter(eF => !meta.fields?.find(mF => eF === mF));
const result = meta.fields?.find(mF => eF === mF);
if (result === undefined) { return eF; } // missing field
return undefined; // field found
});
if (missingFields.length > 0) { if (missingFields.length > 0) {
setError(translate("import_users.error.required_field", { field: missingFields[0] })); setError(translate("import_users.error.required_field", { field: missingFields[0] }));

View File

@@ -275,7 +275,7 @@ const LoginPage = () => {
variant="contained" variant="contained"
type="submit" type="submit"
color="primary" color="primary"
disabled={loading || !supportPassAuth} disabled={loading || !supportPassAuth && loginMethod !== "accessToken"}
fullWidth fullWidth
> >
{translate("ra.auth.sign_in")} {translate("ra.auth.sign_in")}