github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8291 from overleaf/ta-email-emails-ui-tweaks

Browse source 
[SettingsPage] Emails UI Tweaks

GitOrigin-RevId: 352d52badb234ed27ae48c39c4367c633ac83424
This commit is contained in:
Timothée Alby 2022-06-07 09:45:14 +02:00 committed by Copybot
parent 022a8d4198
commit 1fe424631f
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/frontend/js/features/settings/components/emails/actions/make-primary.tsx
View file

@ -40,12 +40,7 @@ const getDescription = (
function PrimaryButton({ children, disabled, onClick }: Button.ButtonProps) { function PrimaryButton({ children, disabled, onClick }: Button.ButtonProps) {
return ( return (
<Button <Button bsSize="small" bsStyle="info" disabled={disabled} onClick={onClick}>
bsSize="small"
bsStyle="success"
disabled={disabled}
onClick={onClick}
>
{children} {children}
</Button> </Button>
) )

6
services/web/frontend/js/features/settings/components/emails/email.tsx
View file

@ -17,7 +17,11 @@ function Email({ userEmailData }: EmailProps) {
return ( return (
<> <>
{userEmailData.email} {userEmailData.email}
{userEmailData.default ? ' (primary)' : ''} {userEmailData.default ? (
<span className="small ms-1">
<span className="label label-info">Primary</span>
</span>
) : null}
{!userEmailData.confirmedAt && ( {!userEmailData.confirmedAt && (
<div className="small"> <div className="small">
<strong> <strong>

3
services/web/test/frontend/features/settings/components/emails/emails-row.test.tsx
View file

@ -50,7 +50,8 @@ describe('<EmailsRow/>', function () {
describe('with affiliated email data', function () { describe('with affiliated email data', function () {
it('renders email info', function () { it('renders email info', function () {
renderEmailsRow(professionalUserData) renderEmailsRow(professionalUserData)
screen.getByText('foo@overleaf.com (primary)') screen.getByText('foo@overleaf.com')
screen.getByText('Primary')
}) })
it('renders actions', function () { it('renders actions', function () {

3
services/web/test/frontend/features/settings/components/emails/emails-section.test.tsx
View file

@ -73,7 +73,8 @@ describe('<EmailsSection />', function () {
fetchMock.get('/user/emails?ensureAffiliation=true', [professionalUserData]) fetchMock.get('/user/emails?ensureAffiliation=true', [professionalUserData])
render(<EmailsSection />) render(<EmailsSection />)
await screen.findByText(`${professionalUserData.email} (primary)`) await screen.findByText(`${professionalUserData.email}`)
screen.getByText('Primary')
}) })
it('shows confirmation status for unconfirmed users', async function () { it('shows confirmation status for unconfirmed users', async function () {