Allow selecting program manager when creating / editing a thesis to c…

…hoose thesis approver

src/client/components/ThesisPage/ThesesPage.tsx

@@ -178,6 +178,7 @@ const ThesesPage = () => {
     programId: '',
     topic: '',
     authors: [],
+    approvers: [],
     status: 'PLANNING',
     startDate: '',
     targetDate: '',
@@ -213,6 +214,7 @@ const ThesesPage = () => {
         },
       ],
       authors: [],
+      approvers: [],
       graders: [{ user, isPrimaryGrader: true, isExternal: false }],
       topic: '',
       status: 'PLANNING',

src/client/components/ThesisPage/ThesisEditForm.tsx

@@ -9,6 +9,8 @@ import { useTranslation } from 'react-i18next'
 import { User, ThesisData, TranslationLanguage } from '@backend/types'
 import BookmarkIcon from '@mui/icons-material/Bookmark'
 import {
+  Alert,
+  AlertTitle,
   Autocomplete,
   Button,
   Dialog,
@@ -33,6 +35,7 @@ import SupervisorSelect from './SupervisorSelect/SupervisorSelect'
 import useUsers from '../../hooks/useUsers'
 import { useDebounce } from '../../hooks/useDebounce'
 import useLoggedInUser from '../../hooks/useLoggedInUser'
+import useProgramManagements from '../../hooks/useProgramManagements'
 import { getFormErrors, getSortedByName } from './util'
 import GraderSelect from './GraderSelect/GraderSelect'
 import ErrorSummary from '../Common/ErrorSummary'
@@ -56,6 +59,14 @@ const ThesisEditForm: React.FC<{
     initialThesis
   )
   const [userSearch, setUserSearch] = useState('')
+  const { programManagements: programManagementsOfApprovers } =
+    useProgramManagements({
+      onlyThesisApprovers: true,
+      programId: editedThesis.programId,
+    })
+  const approvers = programManagementsOfApprovers?.map(
+    (programManagement) => programManagement.user
+  )
 
   const debouncedSearch = useDebounce(userSearch, 700)
   const { users: authorOptions } = useUsers({
@@ -287,15 +298,60 @@ const ThesisEditForm: React.FC<{
                     </MenuItem>
                   ))}
                 </Select>
-                <FormHelperText error>
-                  {t(
-                    formErrors.find((error) => error.path[0] === 'programId')
-                      ?.message
-                  )}
-                </FormHelperText>
               </FormControl>
             )}
 
+            {approvers && approvers.length > 0 && (
+              <>
+                <Alert
+                  id="grader-select-instructions"
+                  severity="info"
+                  variant="outlined"
+                  sx={{ whiteSpace: 'pre-line' }}
+                >
+                  <AlertTitle>
+                    {t('thesisForm:approverInstructions')}
+                  </AlertTitle>
+                </Alert>
+                <FormControl fullWidth>
+                  <InputLabel id="approver-select-label">
+                    {t('thesisForm:approverHeader')}
+                  </InputLabel>
+                  <Select
+                    data-testid="approver-select-input"
+                    required
+                    value={editedThesis.approvers[0]?.id ?? ''}
+                    id="approver"
+                    label="Approver"
+                    name="approver"
+                    onChange={(event) => {
+                      setEditedThesis((oldThesis) => ({
+                        ...oldThesis,
+                        approvers: [
+                          approvers.find((a) => a.id === event.target.value),
+                        ],
+                      }))
+
+                      setFormErrors(
+                        formErrors.filter(
+                          (error) => error.path[0] !== 'approver'
+                        )
+                      )
+                    }}
+                    error={formErrors.some(
+                      (error) => error.path[0] === 'approver'
+                    )}
+                  >
+                    {approvers.map((approver) => (
+                      <MenuItem key={approver.id} value={approver.id}>
+                        {approver.firstName} {approver.lastName}
+                      </MenuItem>
+                    ))}
+                  </Select>
+                </FormControl>{' '}
+              </>
+            )}
+
             <FormControl fullWidth>
               <Autocomplete<User>
                 id="authors"

src/client/locales/en.json

@@ -89,6 +89,8 @@
     "targetDate": "Target date must be after start date"
   },
   "thesisForm": {
+    "approverHeader": "Program manager",
+    "approverInstructions": "Select a program manager, whose expertise is closest to the topic of the thesis, to manage the process.",
     "errorSummary": "Form contains the following errors",
     "newThesisFormTitle": "Create new thesis",
     "editThesisFormTitle": "Edit thesis",

src/client/locales/fi.json

@@ -89,6 +89,8 @@
     "targetDate": "Tavoitepäivän on oltava aloituspäivän jälkeen"
   },
   "thesisForm": {
+    "approverHeader": "Vastaava",
+    "approverInstructions": "Valitse ohjelmavastaava, joka on lähimpänä tutkielman aihepiiriä, hallinnoimaan prosessia.",
     "errorSummary": "Lomake sisältää seuraavia virheitä",
     "newThesisFormTitle": "Uuden tutkielman luonti",
     "editThesisFormTitle": "Tutkielman muokkaus",

src/server/routes/thesis.ts

@@ -16,6 +16,7 @@ import {
   Thesis,
   Supervision,
   Author,
+  Approver,
   User,
   EventLog,
 } from '../db/models'
@@ -49,6 +50,7 @@ const fetchThesisById = async (id: string, user: UserType) => {
 }
 
 const createThesis = async (thesisData: ThesisData, t: Transaction) => {
+  console.log('thesisData', thesisData)
   const createdThesis = await Thesis.create(thesisData, { transaction: t })
 
   const extUsers = await getAndCreateExtUsers(thesisData, t)
@@ -73,6 +75,14 @@ const createThesis = async (thesisData: ThesisData, t: Transaction) => {
     { transaction: t, validate: true, individualHooks: true }
   )
 
+  await Approver.bulkCreate(
+    thesisData.approvers.map((approver) => ({
+      userId: approver.id,
+      thesisId: createdThesis.id,
+    })),
+    { transaction: t, validate: true, individualHooks: true }
+  )
+
   // Create the external users from the graders
   await User.bulkCreate(
     thesisData.graders
@@ -139,6 +149,7 @@ const updateThesis = async (
     })),
     { transaction, validate: true, individualHooks: true }
   )
+
   await Author.destroy({ where: { thesisId: id }, transaction })
   await Author.bulkCreate(
     thesisData.authors.map((author) => ({
@@ -147,6 +158,15 @@ const updateThesis = async (
     })),
     { transaction, validate: true, individualHooks: true }
   )
+
+  await Approver.destroy({ where: { thesisId: id }, transaction })
+  await Approver.bulkCreate(
+    thesisData.approvers.map((approver) => ({
+      userId: approver.id,
+      thesisId: id,
+    })),
+    { transaction, validate: true, individualHooks: true }
+  )
 }
 
 const deleteThesis = async (id: string, transaction: Transaction) => {

src/server/routes/thesisHelpers.ts

@@ -54,6 +54,11 @@ export const getFindThesesOptions = async ({
       as: 'authors',
       attributes: userFields,
     },
+    {
+      model: User,
+      as: 'approvers',
+      attributes: userFields,
+    },
     {
       model: Attachment,
       as: 'researchPlan',

src/server/types.ts

@@ -81,6 +81,7 @@ export interface ThesisData {
   targetDate?: string
   supervisions: SupervisionData[]
   authors: User[]
+  approvers: User[]
   graders: GraderData[]
   researchPlan?: FileData | File
   waysOfWorking?: FileData | File