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

Merge branch '240-use-template-context-to-set-subject' into 'master' 

use template.context to set new email thread subject

Closes #240

See merge request inject/frontend!175
parents f77beebb 7cf067af

frontend/src/email/EmailForm/modules/HeaderArea.tsx

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ const HeaderArea: FC<HeaderAreaProps> = ({ 
            exerciseId={exerciseId}

            {...(emailThread

              ? { threadId: emailThread.id }

              : { emailAddresses: senderList })}

              : { emailAddresses: senderList, setSubject })}

          />

        </>

      )}

frontend/src/email/EmailTemplates/index.tsx

+6 −0
Original line number Diff line number Diff line
@@ -26,17 +26,20 @@ type EmailTemplatesProps = { 
} & (

  | {

      // new thread

      setSubject: Dispatch<SetStateAction<string | undefined>>

      emailAddresses: string[]

      threadId?: undefined

    }

  | {

      // existing thread

      setSubject?: undefined

      emailAddresses?: undefined

      threadId: string

    }

)



const EmailTemplates: FC<EmailTemplatesProps> = ({

  setSubject,

  setSenderAddress,

  setContent,

  setActivateMilestone,
@@ -75,6 +78,9 @@ const EmailTemplates: FC<EmailTemplatesProps> = ({ 
    if (template.sender) {

      setSenderAddress(template.sender)

    }

    if (setSubject) {

      setSubject(template.context)

    }

    setContent(template.content)

    setActivateMilestone(template.activateMilestone)

    setDeactivateMilestone(template.deactivateMilestone)