From 0454046e4d6dc61bb0a5c34f955e333777d05eb6 Mon Sep 17 00:00:00 2001
From: Fredrik Strand Oseberg <fredrik.no@gmail.com>
Date: Tue, 11 May 2021 12:14:26 +0200
Subject: [PATCH] fix: include invite link in email (#294)

---
 .../ConfirmUserAdded/ConfirmUserAdded.tsx     |  8 ++++++-
 .../ConfirmUserEmail/ConfirmUserEmail.tsx     | 15 +++++++++++-
 .../UsersList/UserListItem/UserListItem.tsx   |  1 -
 .../page/admin/users/UsersList/UsersList.jsx  | 24 +++++++++++--------
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserAdded.tsx b/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserAdded.tsx
index b1099e3c26..5142eb3a12 100644
--- a/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserAdded.tsx
+++ b/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserAdded.tsx
@@ -15,7 +15,13 @@ const ConfirmUserAdded = ({
     inviteLink,
 }: IConfirmUserAddedProps) => {
     if (emailSent) {
-        return <ConfirmUserEmail open={open} closeConfirm={closeConfirm} />;
+        return (
+            <ConfirmUserEmail
+                open={open}
+                closeConfirm={closeConfirm}
+                inviteLink={inviteLink}
+            />
+        );
     }
 
     return (
diff --git a/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserEmail/ConfirmUserEmail.tsx b/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserEmail/ConfirmUserEmail.tsx
index d2eefcbdec..872bed7ee5 100644
--- a/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserEmail/ConfirmUserEmail.tsx
+++ b/frontend/src/page/admin/users/ConfirmUserAdded/ConfirmUserEmail/ConfirmUserEmail.tsx
@@ -3,13 +3,19 @@ import Dialogue from '../../../../../component/common/Dialogue';
 
 import { ReactComponent as EmailIcon } from '../../../../../assets/icons/email.svg';
 import { useStyles } from './ConfirmUserEmail.styles';
+import UserInviteLink from '../ConfirmUserLink/UserInviteLink/UserInviteLink';
 
 interface IConfirmUserEmailProps {
     open: boolean;
     closeConfirm: () => void;
+    inviteLink: string;
 }
 
-const ConfirmUserEmail = ({ open, closeConfirm }: IConfirmUserEmailProps) => {
+const ConfirmUserEmail = ({
+    open,
+    closeConfirm,
+    inviteLink,
+}: IConfirmUserEmailProps) => {
     const styles = useStyles();
     return (
         <Dialogue
@@ -26,6 +32,13 @@ const ConfirmUserEmail = ({ open, closeConfirm }: IConfirmUserEmailProps) => {
             <div className={styles.iconContainer}>
                 <EmailIcon className={styles.emailIcon} />
             </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>
     );
 };
diff --git a/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx b/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
index 46085a30dc..79f87b83bb 100644
--- a/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
+++ b/frontend/src/page/admin/users/UsersList/UserListItem/UserListItem.tsx
@@ -41,7 +41,6 @@ const UserListItem = ({
             <TableCell>
                 <Avatar
                     data-loading
-                    variant="rounded"
                     alt={user.name}
                     src={user.imageUrl}
                     title={`${user.name || user.email || user.username} (id: ${
diff --git a/frontend/src/page/admin/users/UsersList/UsersList.jsx b/frontend/src/page/admin/users/UsersList/UsersList.jsx
index 5290cace3c..5f341382b5 100644
--- a/frontend/src/page/admin/users/UsersList/UsersList.jsx
+++ b/frontend/src/page/admin/users/UsersList/UsersList.jsx
@@ -225,16 +225,20 @@ function UsersList({ location }) {
                 validatePassword={validatePassword}
                 user={pwDialog.user}
             />
-            {delUser && (
-                <DelUser
-                    showDialog={delDialog}
-                    closeDialog={closeDelDialog}
-                    user={delUser}
-                    removeUser={onDeleteUser}
-                    userLoading={userLoading}
-                    userApiErrors={userApiErrors}
-                />
-            )}
+
+            <ConditionallyRender
+                condition={delUser}
+                show={
+                    <DelUser
+                        showDialog={delDialog}
+                        closeDialog={closeDelDialog}
+                        user={delUser}
+                        removeUser={onDeleteUser}
+                        userLoading={userLoading}
+                        userApiErrors={userApiErrors}
+                    />
+                }
+            />
         </div>
     );
 }