Merge pull request #283 from uselagoon/invite-user

feat: invite user checkbox for add user modals
uselagoon · Jul 5, 2024 · 17843f4 · 17843f4
2 parents f7c881b + 254b161
commit 17843f4
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 11 deletions.
diff --git a/src/components/Organizations/AddUserToGroup/Styles.tsx b/src/components/Organizations/AddUserToGroup/Styles.tsx
@@ -50,6 +50,11 @@ export const NewMember = styled.div`
     display: flex;
     align-items: center;
   }
+  label.add-user {
+    display: flex;
+    margin-block: 0.5rem;
+    gap: 0.5rem;
+  }
 `;
 
 export const RoleSelect = styled.div`

diff --git a/src/components/Organizations/AddUserToGroup/index.js b/src/components/Organizations/AddUserToGroup/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Mutation } from 'react-apollo';
 import ReactSelect from 'react-select';
 
@@ -11,8 +11,8 @@ import { Footer } from '../SharedStyles';
 import { NewMember, RoleSelect } from './Styles';
 
 export const ADD_GROUP_MEMBER_MUTATION = gql`
-  mutation addUserToGroup($email: String!, $group: String!, $role: GroupRole!) {
-    addUserToGroup(input: { user: { email: $email }, group: { name: $group }, role: $role }) {
+  mutation addUserToGroup($email: String!, $group: String!, $role: GroupRole!, $inviteUser: Boolean) {
+    addUserToGroup(input: { user: { email: $email }, group: { name: $group }, role: $role, inviteUser: $inviteUser }) {
       name
     }
   }
@@ -42,7 +42,7 @@ export const options = [
 ];
 
 /**
- * Confirms the deletion of the specified name and type.
+ * Adds user to group.
  */
 export const AddUserToGroup = ({
   group,
@@ -56,6 +56,13 @@ export const AddUserToGroup = ({
 }) => {
   const userAlreadyExists = users && users.find(u => u.user.email === inputValueEmail);
 
+  const [inviteUser, setInviteUser] = useState(true);
+
+  const closeModal = () => {
+    close();
+    setInviteUser(true);
+  };
+
   return (
     <Mutation mutation={ADD_GROUP_MEMBER_MUTATION} onError={err => console.error(err)}>
       {(addGroupMember, { called, error, data }) => {
@@ -65,7 +72,7 @@ export const AddUserToGroup = ({
         if (data) {
           onAddUser().then(() => {
             setInputValue({ target: { value: '' } });
-            close();
+            closeModal();
           });
         }
         return (
@@ -108,6 +115,16 @@ export const AddUserToGroup = ({
                 />
               </RoleSelect>
             </label>
+            <label className="add-user">
+              Add user to Lagoon if required
+              <input
+                data-cy="inviteUser"
+                className="inputCheckbox"
+                type="checkbox"
+                checked={inviteUser}
+                onChange={() => setInviteUser(!inviteUser)}
+              />
+            </label>
             <div>
               <Footer>
                 <Button
@@ -119,6 +136,7 @@ export const AddUserToGroup = ({
                         email: inputValueEmail,
                         role: selectedRole.value,
                         group: group.name,
+                        inviteUser,
                       },
                     });
                   }}
@@ -127,7 +145,7 @@ export const AddUserToGroup = ({
                 >
                   {userAlreadyExists ? 'Update' : 'Add'}
                 </Button>
-                <Button variant="ghost" action={() => close()}>
+                <Button variant="ghost" action={() => closeModal()}>
                   Cancel
                 </Button>
               </Footer>

diff --git a/src/components/Organizations/AddUserToGroupSelect/index.tsx b/src/components/Organizations/AddUserToGroupSelect/index.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { FC, useState } from 'react';
 import { Mutation } from 'react-apollo';
 import ReactSelect from 'react-select';
 
@@ -8,9 +8,9 @@ import gql from 'graphql-tag';
 import { NewMember, RoleSelect } from '../AddUserToGroup/Styles';
 import { Footer } from '../SharedStyles';
 
-const ADD_GROUP_MEMBER_MUTATION = gql`
-  mutation addUserToGroup($email: String!, $group: String!, $role: GroupRole!) {
-    addUserToGroup(input: { user: { email: $email }, group: { name: $group }, role: $role }) {
+export const ADD_GROUP_MEMBER_MUTATION = gql`
+  mutation addUserToGroup($email: String!, $group: String!, $role: GroupRole!, $inviteUser: Boolean) {
+    addUserToGroup(input: { user: { email: $email }, group: { name: $group }, role: $role, inviteUser: $inviteUser }) {
       name
     }
   }
@@ -56,18 +56,24 @@ interface Props {
 }
 
 const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState, close, onAddUser }) => {
+  const [inviteUser, setInviteUser] = useState(true);
+
   const groupOptions = groups.map(g => {
     return { label: g.name, value: g.name };
   });
 
-  const resetState = () => setNewUserState({ group: '', role: '', email: '' });
+  const resetState = () => {
+    setNewUserState({ group: '', role: '', email: '' });
+    setInviteUser(false);
+  };
 
   return (
     <Mutation<{
       addGroupMember: {
         email: string;
         role: string;
         group: string;
+        inviteUser?: boolean;
       };
     }>
       mutation={ADD_GROUP_MEMBER_MUTATION}
@@ -151,6 +157,16 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
                 />
               </RoleSelect>
             </label>
+            <label className="add-user">
+              Add user to Lagoon if required
+              <input
+                data-cy="inviteUser"
+                className="inputCheckbox"
+                type="checkbox"
+                checked={inviteUser}
+                onChange={() => setInviteUser(!inviteUser)}
+              />
+            </label>
             <div>
               <Footer>
                 <Button
@@ -163,6 +179,7 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
                         email: newUserState.email,
                         role: newUserState.role,
                         group: newUserState.group,
+                        inviteUser,
                       },
                     });
                   }}

diff --git a/src/components/Organizations/SharedStyles.tsx b/src/components/Organizations/SharedStyles.tsx
@@ -408,6 +408,11 @@ export const ModalChildren = styled.div`
       }
     }
   }
+  label.add-user {
+    display: flex;
+    margin-block: 0.5rem;
+    gap: 0.5rem;
+  }
 `;
 export const ViewMore = styled.span`
   color: #4578e6 !important;