devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-01-14 07:44:23 +00:00
parent 8aca34e8b5 360e6f8f60
commit 9baf3109c9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/UserCard.tsx
View File

@@ -292,7 +292,8 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
isDisabled={disabled} // editing country manager should only be available for dev/admin
isDisabled={!['developer', 'admin'].includes(loggedInUser.type)}
/> />
)} )}
</div> </div>

2
src/pages/(admin)/BatchCodeGenerator.tsx
View File

@@ -103,7 +103,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
return ( return (
<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl"> <div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
<label className="font-normal text-base text-mti-gray-dim">Choose a .xlsx file containing e-mails</label> <label className="font-normal text-base text-mti-gray-dim">Choose an Excel file containing e-mails</label>
<Button onClick={openFilePicker} isLoading={isLoading} disabled={isLoading}> <Button onClick={openFilePicker} isLoading={isLoading} disabled={isLoading}>
{filesContent.length > 0 ? filesContent[0].name : "Choose a file"} {filesContent.length > 0 ? filesContent[0].name : "Choose a file"}
</Button> </Button>