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

Merge branch 'citadel-fixes-3-0-2' into 'citadel-fixes' 

Citadel fixes 3.0.2

See merge request inject/frontend!632
parents c95a7aa7 949f5c4f

codegen/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/codegen",

  "version": "3.0.1",

  "version": "3.0.2",

  "description": "GraphQL API Codegen Setup for the Inject Backend",

  "main": "index.js",

  "license": "MIT",

frontend/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/frontend",

  "version": "3.0.1",

  "version": "3.0.2",

  "description": "Main wrapper for rendering INJECT Frontend",

  "main": "index.js",

  "license": "MIT",

frontend/src/exercisepanel/ExerciseManager/ExerciseCreator.tsx

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ const overrideConfigClass = css` 
  margin-top: 1rem;

`



const TEAMS_MAX = 20

const TEAMS_MAX = 50



interface ExerciseCreatorProps {

  open: boolean

frontend/src/pages/instructor/[exerciseId]/[teamId]/email/_layout.tsx

+8 −2
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ const SentByTeam = () => { 
  const { exerciseId, teamId } = useParams(

    '/instructor/:exerciseId/:teamId/email'

  )

  const count = useGetEmailThreadUnreadCountSuspense(teamId, 'sent')

  const count = useGetEmailThreadUnreadCountSuspense(

    teamId,

    EmailSelection.SENT

  )

  return (

    <LinkButton

      link={[
@@ -42,7 +45,10 @@ const ReceivedByTeam = () => { 
  const { exerciseId, teamId } = useParams(

    '/instructor/:exerciseId/:teamId/email'

  )

  const count = useGetEmailThreadUnreadCountSuspense(teamId, 'received')

  const count = useGetEmailThreadUnreadCountSuspense(

    teamId,

    EmailSelection.RECEIVED

  )



  return (

    <LinkButton

frontend/src/pages/trainee/[exerciseId]/[teamId]/email/_layout.tsx

+8 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ import { Outlet } from 'react-router-dom' 


const Received = () => {

  const { exerciseId, teamId } = useParams('/trainee/:exerciseId/:teamId/email')

  const count = useGetEmailThreadUnreadCountSuspense(teamId, 'received')

  const count = useGetEmailThreadUnreadCountSuspense(

    teamId,

    EmailSelection.RECEIVED

  )

  return (

    <LinkButton

      link={[
@@ -35,7 +38,10 @@ const Received = () => { 


const Sent = () => {

  const { exerciseId, teamId } = useParams('/trainee/:exerciseId/:teamId/email')

  const count = useGetEmailThreadUnreadCountSuspense(teamId, 'sent')

  const count = useGetEmailThreadUnreadCountSuspense(

    teamId,

    EmailSelection.SENT

  )



  return (

    <LinkButton