Skip to content
Snippets Groups Projects
Commit 55c532a7 authored by Tore.Brede's avatar Tore.Brede
Browse files

GREG-60: Sending data to invite endpoint instead of register

parent 790c6b9d
No related branches found
No related tags found
1 merge request!92GREG-60: Sending data to invite endpoint instead of register
Pipeline #96010 passed
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
type RoleTypeData = { type RoleTypeData = {
id: number
identifier: string identifier: string
name_en: string name_en: string
name_nb: string name_nb: string
...@@ -10,7 +11,7 @@ function useRoleTypes(): RoleTypeData[] { ...@@ -10,7 +11,7 @@ function useRoleTypes(): RoleTypeData[] {
const [roleTypes, setRoleTypes] = useState<RoleTypeData[]>([]) const [roleTypes, setRoleTypes] = useState<RoleTypeData[]>([])
async function fetchRoleTypes() { async function fetchRoleTypes() {
fetch(`http://localhost:3000/api/ui/v1/roletypes`) fetch(`/api/ui/v1/roletypes`)
.then(data => data.text()) .then(data => data.text())
.then((result => { .then((result => {
// The response is a JSON-array // The response is a JSON-array
......
...@@ -123,7 +123,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per ...@@ -123,7 +123,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
error={!!errors.email} error={!!errors.email}
helperText={errors.email && errors.email.message} helperText={errors.email && errors.email.message}
{...register(`email`, { {...register(`email`, {
validate: isValidEmail validate: isValidEmail,
})} })}
/> />
<FormControl fullWidth> <FormControl fullWidth>
...@@ -161,7 +161,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per ...@@ -161,7 +161,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
roleTypes.sort(roleTypeSort()) roleTypes.sort(roleTypeSort())
.map((roleType) => ( .map((roleType) => (
<MenuItem <MenuItem
value={roleType.identifier}>{i18n.language === 'en' ? roleType.name_en : roleType.name_nb}</MenuItem> value={roleType.id}>{i18n.language === 'en' ? roleType.name_en : roleType.name_nb}</MenuItem>
)) ))
} }
</TextField> </TextField>
...@@ -211,4 +211,4 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per ...@@ -211,4 +211,4 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
) )
}) })
export default StepPersonForm export default StepPersonForm
\ No newline at end of file
...@@ -11,7 +11,7 @@ import { postJsonOpts } from '../../utils' ...@@ -11,7 +11,7 @@ import { postJsonOpts } from '../../utils'
import { PersonFormMethods } from './personFormMethods' import { PersonFormMethods } from './personFormMethods'
import useOus from '../../hooks/useOus' import useOus from '../../hooks/useOus'
import useRoleTypes from '../../hooks/useRoleTypes' import useRoleTypes from '../../hooks/useRoleTypes'
import { SubmitState } from './submitState' import SubmitState from './submitState'
interface StepSummaryProperties { interface StepSummaryProperties {
...@@ -31,15 +31,18 @@ const StepSummary = forwardRef((props: StepSummaryProperties, ref: Ref<PersonFor ...@@ -31,15 +31,18 @@ const StepSummary = forwardRef((props: StepSummaryProperties, ref: Ref<PersonFor
const payload = { const payload = {
first_name: data.first_name, first_name: data.first_name,
last_name: data.last_name, last_name: data.last_name,
role_type: data.role_type,
role_start: data.role_start === null ? null : format(data.role_start as Date, 'yyyy-MM-dd'),
role_end: data.role_end === null ? null : format(data.role_end as Date, 'yyyy-MM-dd'),
comment: data.comment,
ou: data.ou_id,
email: data.email, email: data.email,
role: {
type: data.role_type,
start_date: data.role_start === null ? null : format(data.role_start as Date, 'yyyy-MM-dd'),
end_date: data.role_end === null ? null : format(data.role_end as Date, 'yyyy-MM-dd'),
comments: data.comment,
orgunit_id: data.ou_id,
},
} }
console.log('submitting', JSON.stringify(payload)) console.log('submitting', JSON.stringify(payload))
fetch('/api/ui/v1/register/', postJsonOpts(payload)) fetch('/api/ui/v1/invite/', postJsonOpts(payload))
.then((res) => { .then((res) => {
if (!res.ok) { if (!res.ok) {
onSubmitFailure() onSubmitFailure()
...@@ -216,4 +219,4 @@ const StepSummary = forwardRef((props: StepSummaryProperties, ref: Ref<PersonFor ...@@ -216,4 +219,4 @@ const StepSummary = forwardRef((props: StepSummaryProperties, ref: Ref<PersonFor
}, },
) )
export default StepSummary export default StepSummary
\ No newline at end of file
...@@ -6,4 +6,4 @@ from greg.models import RoleType ...@@ -6,4 +6,4 @@ from greg.models import RoleType
class RoleTypeSerializerUi(ModelSerializer): class RoleTypeSerializerUi(ModelSerializer):
class Meta: class Meta:
model = RoleType model = RoleType
fields = ("identifier", "name_en", "name_nb") fields = ("id", "identifier", "name_en", "name_nb")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment