Merge pull request #200 from UniversityOfHelsinkiCS/studytrack-opt-out

Studytrack opt out feature
UniversityOfHelsinkiCS · Dec 16, 2024 · 9b45e5d · 9b45e5d
2 parents b6ff2e3 + eed668e
commit 9b45e5d
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 3 deletions.
diff --git a/src/client/components/ThesisPage/ThesisEditForm.tsx b/src/client/components/ThesisPage/ThesisEditForm.tsx
@@ -261,7 +261,7 @@ const ThesisEditForm: FC<{
                 <Select
                   data-testid="study-track-select-input"
                   required
-                  value={editedThesis.studyTrackId}
+                  value={editedThesis.studyTrackId ?? ''}
                   id="studyTrackId"
                   label="Study Track"
                   name="studyTrackId"
@@ -282,6 +282,9 @@ const ThesisEditForm: FC<{
                     (error) => error.path[0] === 'studyTrackId'
                   )}
                 >
+                  <MenuItem value="">
+                    <em>{t('common:none')}</em>
+                  </MenuItem>
                   {sortedStudyTracks.map((studyTrack) => (
                     <MenuItem key={studyTrack.id} value={studyTrack.id}>
                       {studyTrack.name[language]}

diff --git a/src/client/hooks/useThesesMutation.tsx b/src/client/hooks/useThesesMutation.tsx
@@ -7,6 +7,11 @@ export const useCreateThesisMutation = () => {
   const mutationFn = async (data: ThesisData) => {
     const formData = new FormData()
 
+    // Check for the empty studyTrackId
+    // If it's an empty string, set it to null
+    if (data.studyTrackId === '') {
+      data.studyTrackId = null
+    }
     formData.append('json', JSON.stringify(data))
 
     if (data.researchPlan instanceof Blob) {
@@ -40,6 +45,11 @@ export const useEditThesisMutation = () => {
   }) => {
     const formData = new FormData()
 
+    // Check for the empty studyTrackId
+    // If it's an empty string, set it to null
+    if (data.studyTrackId === '') {
+      data.studyTrackId = null
+    }
     formData.append('json', JSON.stringify(data))
 
     if (data.researchPlan instanceof Blob) {

diff --git a/src/client/locales/en.json b/src/client/locales/en.json
@@ -25,7 +25,8 @@
     "removeButton": "Remove",
     "error": "Error",
     "thesisPreview": "Thesis preview",
-    "theses": "Theses"
+    "theses": "Theses",
+    "none": "No studytrack"
   },
   "eventLog": {
     "thesis": "Thesis",

diff --git a/src/client/locales/fi.json b/src/client/locales/fi.json
@@ -25,7 +25,8 @@
     "removeConfirmation": "Vahvista poisto kirjoittamalla (<strong>{{confirmationText}}</strong>) alla olevaan kenttään:",
     "error": "Virhe",
     "thesisPreview": "Tutkielman esikatselu",
-    "theses": "Tutkielmat"
+    "theses": "Tutkielmat",
+    "none": "Ei opintosuuntaa"
   },
   "eventLog": {
     "thesis": "Tutkielma",

diff --git a/src/server/routes/thesis.integration-test.js b/src/server/routes/thesis.integration-test.js
@@ -1935,6 +1935,58 @@ describe('thesis router', () => {
         expect(eventLog).not.toBeNull()
       })
 
+      it('should return 201 with empty studytrack and log the event', async () => {
+        const newThesis = {
+          programId: 'New program',
+          studyTrackId: null,
+          topic: 'New topic',
+          status: 'PLANNING',
+          startDate: '1970-01-01T00:00:00.000Z',
+          targetDate: '2070-01-01T00:00:00.000Z',
+          supervisions: [
+            {
+              user: user1,
+              percentage: 100,
+              isExternal: false,
+              isPrimarySupervisor: true,
+            },
+          ],
+          graders: [
+            {
+              user: user4,
+              isPrimaryGrader: true,
+              isExternal: false,
+            },
+          ],
+          authors: [user2],
+        }
+
+        const response = await request
+          .post('/api/theses')
+          .set('hygroupcn', 'grp-toska')
+          .attach(
+            'waysOfWorking',
+            path.resolve(dirname(fileURLToPath(import.meta.url)), './index.ts')
+          )
+          .attach(
+            'researchPlan',
+            path.resolve(dirname(fileURLToPath(import.meta.url)), './index.ts')
+          )
+          .field('json', JSON.stringify(newThesis))
+
+        expect(response.status).toEqual(201)
+
+        const eventLog = await EventLog.findOne({
+          where: { type: 'THESIS_CREATED', thesisId: response.body.id },
+        })
+
+        expect(eventLog).not.toBeNull()
+
+        const thesis = await Thesis.findByPk(response.body.id)
+        expect(thesis).not.toBeNull()
+        expect(thesis.studyTrackId).toBeNull()
+      })
+
       it('should return 400 and not log the event if the request is missing a required field', async () => {
         const newThesis = {
           programId: 'New program',