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

Merge branch '678-chore-new-version-of-backend-v3-5-0' into 'main' 

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

Closes #678

See merge request inject/frontend!584
parents 741b17dd a3683a53

backend @ 5c491946

Compare c359c0e1 to 5c491946
Original line number Diff line number Diff line 
Subproject commit c359c0e1adf356048a6da9d9052c4460861d8be2
 
Subproject commit 5c491946c1bda68a6e9b0936c427b59a66f3b778

codegen/package.json

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

  "name": "@inject/codegen",

  "version": "3.4.0",

  "version": "3.5.0",

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

  "main": "index.js",

  "license": "MIT",

editor/package.json

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

  "name": "@inject/editor",

  "version": "3.4.0",

  "version": "3.5.0",

  "description": "Editor module to Inject Exercise Platform",

  "main": "index.js",

  "license": "MIT",

frontend/package.json

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

  "name": "@inject/frontend",

  "version": "3.4.0",

  "version": "3.5.0",

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

  "main": "index.js",

  "license": "MIT",

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

+25 −2
Original line number Diff line number Diff line
@@ -86,13 +86,36 @@ const AnswerState = ( 
        let result = true

        set(({ questions }) => ({

          questions: questions.map(question => {

            let error = ''

            if (question.answer === INVALID_VALUE) {

              result = false

              error = 'Answer this question'

            } else {

              let min: number | null = null

              let max: number | null = null



              if (

                question.question.details.__typename ===

                  'FreeFormQuestionDetailsType' ||

                question.question.details.__typename ===

                  'AutoFreeFormQuestionDetailsType'

              ) {

                const details = question.question.details

                min = details.min

                max = details.max

              }



              if (min && question.answer.length < min) {

                result = false

                error = `Your answer is too short. The minimum length  is ${min} character${min === 1 ? '' : 's'}.`

              } else if (max && max != -1 && question.answer.length > max) {

                result = false

                error = `Your answer is too long. The maximum length is ${max} character${max === 1 ? '' : 's'}.`

              }

            }

            return {

              ...question,

              error:

                question.answer === INVALID_VALUE ? 'Answer this question' : '',

              error: error || '',

            }

          }),

        }))