Commit c60d52f0 authored by Patrik Kotucek's avatar Patrik Kotucek
Browse files

Merge branch 'main' into 320-enable-evaluating-emails-in-instructor-email-client

parents 2d5d4679 baf70b42

editor/src/assets/pageContent/injectSpecification.ts

+6 −4
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ export const OVERLAY_FORM: Form = { 


export const INFORMATION_INJECT_FORM: Form = {

  name: {

    label: 'Name',

    label: 'Display Name',

    tooltip: '',

    optional: true,

  },

  content: {

    label: 'Content',
@@ -71,9 +72,9 @@ export const INFORMATION_INJECT_FORM: Form = { 


export const EMAIL_INJECT_FORM: Form = {

  name: {

    label: 'Name',

    label: 'Display Name',

    tooltip: '',

    optional: false,

    optional: true,

  },

  address: {

    label: 'Address',
@@ -107,8 +108,9 @@ export const EMAIL_INJECT_FORM: Form = { 


export const QUESTIONNAIRE_FORM: Form = {

  title: {

    label: 'Title',

    label: 'Display Name',

    tooltip: '',

    optional: true,

  },

  content: {

    label: 'Content',

editor/src/assets/pageContent/injects.ts

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import type { Form } from '@inject/shared' 


export const INJECT_FORM: Form = {

  name: {

    label: 'Title',

    label: 'Display name',

    tooltip: '',

  },

  content: {

editor/src/assets/pageContent/milestone.ts

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ import type { Form } from '@inject/shared' 


export const MILESTONE_FORM: Form = {

  name: {

    label: 'Title',

    label: 'Display name',

    tooltip: '',

    optional: true,

  },

  description: {

    label: 'What is this milestone about?',

editor/src/assets/pageContent/tools.ts

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ import type { Form } from '@inject/shared' 


export const TOOL_FORM: Form = {

  name: {

    label: 'Name',

    label: 'Display Name',

    tooltip: '',

    optional: true,

  },

  category: {

    label: 'Category',

editor/src/components/EmailAddressSpecification/index.tsx

+13 −7
Original line number Diff line number Diff line 
import { NonIdealState } from '@blueprintjs/core'

import { Button, NonIdealState } from '@blueprintjs/core'

import { css } from '@emotion/css'

import { useNavigate } from '@tanstack/react-router'

import { useLiveQuery } from 'dexie-react-hooks'

import { useEffect, useMemo, type FC } from 'react'

import { GENERIC_CONTENT } from '../../assets/generalContent'

import { db } from '../../indexeddb/db'

import { EmailAddressesRoute } from '../../routes/create/emails'

import { EmailAddressSpecificationRoute } from '../../routes/create/emails/$address'

import SaveButtonGroup from '../SaveButtonGroup'

import { EmailAddressForm } from './EmailAddressForm'

import { initEmailAddressStore } from './store'
@@ -68,10 +67,17 @@ export const EmailAddressSpecification: FC<EmailAddressSpecificationProps> = ({ 
      >

        <EmailAddressForm state={state} emailAddress={emailAddress} />

      </div>

      <SaveButtonGroup

        isValid

        handleUpdate={onSave}

        prevPath={{ to: EmailAddressesRoute.to }}

      <Button

        disabled={false} //TODO

        onClick={() => {

          onSave()

        }}

        icon='edit'

        text={GENERIC_CONTENT.buttons.save}

        intent='primary'

        className={css`

          width: 9rem;

        `}

      />

    </main>

  )