mirror of
https://github.com/Unleash/unleash.git
synced 2025-02-23 00:22:19 +01:00
fix: include invite link in email (#294)
This commit is contained in:
parent
76f9cd0577
commit
0454046e4d
@ -15,7 +15,13 @@ const ConfirmUserAdded = ({
|
|||||||
inviteLink,
|
inviteLink,
|
||||||
}: IConfirmUserAddedProps) => {
|
}: IConfirmUserAddedProps) => {
|
||||||
if (emailSent) {
|
if (emailSent) {
|
||||||
return <ConfirmUserEmail open={open} closeConfirm={closeConfirm} />;
|
return (
|
||||||
|
<ConfirmUserEmail
|
||||||
|
open={open}
|
||||||
|
closeConfirm={closeConfirm}
|
||||||
|
inviteLink={inviteLink}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -3,13 +3,19 @@ import Dialogue from '../../../../../component/common/Dialogue';
|
|||||||
|
|
||||||
import { ReactComponent as EmailIcon } from '../../../../../assets/icons/email.svg';
|
import { ReactComponent as EmailIcon } from '../../../../../assets/icons/email.svg';
|
||||||
import { useStyles } from './ConfirmUserEmail.styles';
|
import { useStyles } from './ConfirmUserEmail.styles';
|
||||||
|
import UserInviteLink from '../ConfirmUserLink/UserInviteLink/UserInviteLink';
|
||||||
|
|
||||||
interface IConfirmUserEmailProps {
|
interface IConfirmUserEmailProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
closeConfirm: () => void;
|
closeConfirm: () => void;
|
||||||
|
inviteLink: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ConfirmUserEmail = ({ open, closeConfirm }: IConfirmUserEmailProps) => {
|
const ConfirmUserEmail = ({
|
||||||
|
open,
|
||||||
|
closeConfirm,
|
||||||
|
inviteLink,
|
||||||
|
}: IConfirmUserEmailProps) => {
|
||||||
const styles = useStyles();
|
const styles = useStyles();
|
||||||
return (
|
return (
|
||||||
<Dialogue
|
<Dialogue
|
||||||
@ -26,6 +32,13 @@ const ConfirmUserEmail = ({ open, closeConfirm }: IConfirmUserEmailProps) => {
|
|||||||
<div className={styles.iconContainer}>
|
<div className={styles.iconContainer}>
|
||||||
<EmailIcon className={styles.emailIcon} />
|
<EmailIcon className={styles.emailIcon} />
|
||||||
</div>
|
</div>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }} variant="subtitle1">
|
||||||
|
In a rush?
|
||||||
|
</Typography>
|
||||||
|
<Typography>
|
||||||
|
You may also copy the invite link and send it to the user.
|
||||||
|
</Typography>
|
||||||
|
<UserInviteLink inviteLink={inviteLink} />
|
||||||
</Dialogue>
|
</Dialogue>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -41,7 +41,6 @@ const UserListItem = ({
|
|||||||
<TableCell>
|
<TableCell>
|
||||||
<Avatar
|
<Avatar
|
||||||
data-loading
|
data-loading
|
||||||
variant="rounded"
|
|
||||||
alt={user.name}
|
alt={user.name}
|
||||||
src={user.imageUrl}
|
src={user.imageUrl}
|
||||||
title={`${user.name || user.email || user.username} (id: ${
|
title={`${user.name || user.email || user.username} (id: ${
|
||||||
|
@ -225,7 +225,10 @@ function UsersList({ location }) {
|
|||||||
validatePassword={validatePassword}
|
validatePassword={validatePassword}
|
||||||
user={pwDialog.user}
|
user={pwDialog.user}
|
||||||
/>
|
/>
|
||||||
{delUser && (
|
|
||||||
|
<ConditionallyRender
|
||||||
|
condition={delUser}
|
||||||
|
show={
|
||||||
<DelUser
|
<DelUser
|
||||||
showDialog={delDialog}
|
showDialog={delDialog}
|
||||||
closeDialog={closeDelDialog}
|
closeDialog={closeDelDialog}
|
||||||
@ -234,7 +237,8 @@ function UsersList({ location }) {
|
|||||||
userLoading={userLoading}
|
userLoading={userLoading}
|
||||||
userApiErrors={userApiErrors}
|
userApiErrors={userApiErrors}
|
||||||
/>
|
/>
|
||||||
)}
|
}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user