Commit a5a8b51f authored by Marek Veselý's avatar Marek Veselý
Browse files

remove exerciseId and use getKey context

parent 743ed206

frontend/src/email/EmailForm/InstructorEmailForm.tsx

+5 −2
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ import notEmpty from '@inject/shared/utils/notEmpty' 
import { useGetEmailContacts } from '@inject/graphql/queries/GetEmailContacts.generated'

import useThreadSubmission from './useThreadSubmission'



const InstructorEmailForm: FC<EmailFormProps> = ({

interface InstructorEmailFormProps extends EmailFormProps {

  exerciseId: string

}



const InstructorEmailForm: FC<InstructorEmailFormProps> = ({

  exerciseId,

  emailThread,

  threadId,
@@ -22,7 +26,6 @@ const InstructorEmailForm: FC<EmailFormProps> = ({ 
  onFinish,

}) => {

  const formState = useFormState({

    exerciseId,

    inInstructor: true,

    teamId,

    emailThreadId: threadId,

frontend/src/email/EmailForm/TraineeEmailForm.tsx

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ interface TraineeEmailFormProps extends EmailFormProps { 
const TraineeEmailForm: FC<TraineeEmailFormProps> = ({

  emailThread,

  teamAddress,

  exerciseId,

  threadId,

  teamId,

  onFinish,
@@ -41,7 +40,6 @@ const TraineeEmailForm: FC<TraineeEmailFormProps> = ({ 
    teamAddress,

    inInstructor: false,

    teamId,

    exerciseId,

    emailThreadId: threadId,

  })

frontend/src/email/EmailForm/typing.ts

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ import { EmailThread } from '@inject/graphql/fragments/EmailThread.generated' 


export type EmailFormProps = {

  emailThread?: EmailThread

  exerciseId: string

  teamId: string

  threadId?: string

  onFinish: () => void

frontend/src/email/EmailForm/useFormState.ts

+0 −5
Original line number Diff line number Diff line
@@ -30,12 +30,10 @@ export interface FormState { 


const useFormState = ({

  teamAddress,

  exerciseId,

  teamId,

  inInstructor,

  emailThreadId,

}: {

  exerciseId: string

  teamId: string

  inInstructor: boolean

  emailThreadId: string | undefined
@@ -56,7 +54,6 @@ const useFormState = ({ 
  const [draftMutate] = useWriteEmailDraft()

  const { data: draftData } = useReturnLocalEmailDraft({

    variables: {

      exerciseId,

      teamId,

      instructor: inInstructor,

      emailThreadId: emailThreadId || null,
@@ -84,7 +81,6 @@ const useFormState = ({ 
    draftMutate({

      variables: {

        emailDraft: {

          exerciseId,

          teamId,

          instructor: inInstructor,

          emailThreadId,
@@ -122,7 +118,6 @@ const useFormState = ({ 
    draftMutate({

      variables: {

        emailDraft: {

          exerciseId,

          teamId,

          instructor: inInstructor,

          emailThreadId,

frontend/src/email/EmailFormOverlay/index.tsx

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ const EmailFormOverlay: FC<EmailFormOverlayProps> = ({ 
            onFinish={() => setOpen(false)}

            teamId={teamId}

            teamAddress={teamAddress}

            exerciseId={exerciseId}

            threadId={emailThread?.id}

            emailThread={emailThread}

          />