Commit 23a5bf3b authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '732-chore-new-version-of-backend-v3-20-0-fix' into 'main' 

Resolve "Chore: New version of Backend - v3.20.0"

Closes #732

See merge request inject/frontend!646
parents c2ed3ae4 f6b4659d

backend @ aebac181

Compare 618c22b1 to aebac181
Original line number Diff line number Diff line 
Subproject commit 618c22b1d29d7b7b6686028e51ff537f517754f5
 
Subproject commit aebac181798e5fa1b501784a8d8aaf38a8eba71b

codegen/package.json

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

  "name": "@inject/codegen",

  "version": "3.19.0",

  "version": "3.20.0",

  "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.19.0",

  "version": "3.20.0",

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

  "main": "index.js",

  "license": "MIT",

frontend/src/actionlog/InjectMessage/Content/TraineeQuestionnaireContent.tsx

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ interface TraineeQuestionnaireContentProps { 
  exerciseId: string

  getFileLink: (fileId: string) => NavigateOptions

  onClose?: () => void

  lateSubmission: boolean

  postExerciseSubmission: boolean

}



const MultipleUsersWarning = () => (
@@ -146,7 +146,7 @@ const TraineeQuestionnaireContent: FC<TraineeQuestionnaireContentProps> = ({ 
  exerciseId,

  onClose,

  getFileLink,

  lateSubmission,

  postExerciseSubmission,

}) => {

  const { running } = useLoopStatus()

  const [submitError, setSubmitError] = useState('')
@@ -205,7 +205,7 @@ const TraineeQuestionnaireContent: FC<TraineeQuestionnaireContentProps> = ({ 
      case 'SENT':

        if (

          !running &&

          (!lateSubmission ||

          (!postExerciseSubmission ||

            !exerciseFinishedData ||

            !exerciseFinishedData.exerciseId.finished)

        ) {
@@ -222,7 +222,7 @@ const TraineeQuestionnaireContent: FC<TraineeQuestionnaireContentProps> = ({ 
      default:

        throw new Error(`Unknown status: ${status}`)

    }

  }, [status, running, lateSubmission, exerciseFinishedData])

  }, [status, running, postExerciseSubmission, exerciseFinishedData])



  const handleSubmit = useCallback(

    (event: FormEvent<HTMLFormElement>) => {

frontend/src/actionlog/InjectMessage/Content/index.tsx

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ export const Content: FC<ContentProps> = ({ 
          teamId={teamId}

          exerciseId={exerciseId}

          onClose={onClose}

          lateSubmission={teamState.questionnaire.lateSubmission}

          postExerciseSubmission={

            teamState.questionnaire.postExerciseSubmission

          }

        />

      )

    }