add checkbox & canInvite variable

sillsdev · Jul 17, 2024 · 561b42f · 561b42f
1 parent 6737890
commit 561b42f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/backend/LexBoxApi/GraphQL/ProjectMutations.cs b/backend/LexBoxApi/GraphQL/ProjectMutations.cs
@@ -69,7 +69,8 @@ public record CreateProjectResponse(Guid? Id, CreateProjectResult Result);
     [UseMutationConvention]
     [UseFirstOrDefault]
     [UseProjection]
-    public async Task<IQueryable<Project>> AddProjectMember(IPermissionService permissionService,
+    public async Task<IQueryable<Project>> AddProjectMember(
+        IPermissionService permissionService,
         LoggedInContext loggedInContext,
         AddProjectMemberInput input,
         LexBoxDbContext dbContext,
@@ -87,12 +88,16 @@ public async Task<IQueryable<Project>> AddProjectMember(IPermissionService permi
             {
                 throw NotFoundException.ForType<User>();
             }
-            else
+            else if (input.canInvite)
             {
                 var manager = loggedInContext.User;
                 await emailService.SendCreateAccountEmail(email, input.ProjectId, input.Role, manager.Name, project.Name);
                 throw new ProjectMemberInvitedByEmail("Invitation email sent");
             }
+            else
+            {
+                throw NotFoundException.ForType<User>();
+            }
         }
         if (user.Projects.Any(p => p.ProjectId == input.ProjectId))
         {

diff --git a/backend/LexBoxApi/Models/Project/ProjectMemberInputs.cs b/backend/LexBoxApi/Models/Project/ProjectMemberInputs.cs
@@ -3,7 +3,7 @@
 
 namespace LexBoxApi.Models.Project;
 
-public record AddProjectMemberInput(Guid ProjectId, string UsernameOrEmail, ProjectRole Role);
+public record AddProjectMemberInput(Guid ProjectId, string UsernameOrEmail, ProjectRole Role, bool canInvite);
 
 public record BulkAddProjectMembersInput(Guid? ProjectId, string[] Usernames, ProjectRole Role, string PasswordHash);
 

diff --git a/frontend/schema.graphql b/frontend/schema.graphql
@@ -506,6 +506,7 @@ input AddProjectMemberInput {
   projectId: UUID!
   usernameOrEmail: String!
   role: ProjectRole!
+  canInvite: Boolean!
 }
 
 input AddProjectToOrgInput {

diff --git a/frontend/src/lib/components/modals/FormModal.svelte b/frontend/src/lib/components/modals/FormModal.svelte
@@ -97,6 +97,7 @@
     <slot name="extraActions" />
   </svelte:fragment>
   <svelte:fragment slot="actions" let:submitting>
+    <slot name="checkbox"/>
     {#if !done}
       <SubmitButton form="modalForm" variant={submitVariant} loading={submitting}>
         <slot name="submitText" />

diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/AddProjectMember.svelte
@@ -10,13 +10,15 @@
   import { page } from '$app/stores'
   import UserTypeahead from '$lib/forms/UserTypeahead.svelte';
   import { SupHelp, helpLinks } from '$lib/components/help';
+  import Checkbox from '$lib/forms/Checkbox.svelte';
 
   export let projectId: string;
   const schema = z.object({
     usernameOrEmail: z.string().trim()
       .min(1, $t('project_page.add_user.empty_user_field'))
       .refine((value) => !value.includes('@') || isEmail(value), { message: $t('form.invalid_email') }),
     role: z.enum([ProjectRole.Editor, ProjectRole.Manager]).default(ProjectRole.Editor),
+    canInvite: z.boolean().default(false),
   });
   let formModal: FormModal<typeof schema>;
   $: form = formModal?.form();
@@ -30,6 +32,7 @@
         projectId,
         usernameOrEmail: $form.usernameOrEmail,
         role: $form.role,
+        canInvite: $form.canInvite,
       });
 
       if (error?.byType('NotFoundError')) {
@@ -93,6 +96,15 @@
     />
   {/if}
   <ProjectRoleSelect bind:value={$form.role} error={errors.role} />
+  <span slot="checkbox">
+    <Checkbox
+      id="invite"
+      label={'Invite'}
+      variant="checkbox-warning"
+      labelColor="text-warning"
+      bind:value={$form.canInvite}
+    />
+  </span>
   <span slot="submitText">
     {#if $form.usernameOrEmail.includes('@')}
       {$t('project_page.add_user.submit_button_email')}