VKT(Frontend): Keep track of contacted examiners

Opetushallitus · Nov 25, 2024 · 79d3a64 · 79d3a64
1 parent 8e5c163
commit 79d3a64
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/frontend/packages/vkt/public/i18n/fi-FI/public.json b/frontend/packages/vkt/public/i18n/fi-FI/public.json
@@ -450,6 +450,7 @@
           "examDates": "Tutkintopäivät"
         },
         "row": {
+          "alreadyContacted": "Yhteydenotto lähetetty",
           "byRequest": "Sovittavissa",
           "contact": "Ota yhteyttä"
         }

diff --git a/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx b/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx
@@ -30,6 +30,7 @@ import { AppRoutes, ExamLanguage } from 'enums/app';
 import { PublicExaminer } from 'interfaces/publicExaminer';
 import { resetPublicEnrollmentContact } from 'redux/reducers/publicEnrollmentContact';
 import { setPublicExaminerLanguageFilter } from 'redux/reducers/publicExaminer';
+import { publicEnrollmentContactSelector } from 'redux/selectors/publicEnrollmentContact';
 import {
   publicExaminerSelector,
   selectFilteredPublicExaminers,
@@ -81,6 +82,13 @@ const DesktopExaminerRow = ({
     );
   };
 
+  const { contactedExaminers } = useAppSelector(
+    publicEnrollmentContactSelector,
+  );
+  const alreadyContacted = contactedExaminers.find(
+    (contacted) => id === contacted.id,
+  );
+
   return (
     <TableRow sx={{ verticalAlign: 'text-top' }}>
       <TableCell>
@@ -113,13 +121,17 @@ const DesktopExaminerRow = ({
         </Text>
       </TableCell>
       <TableCell>
-        <CustomButton
-          color={Color.Secondary}
-          variant={Variant.Outlined}
-          onClick={handleOnClick}
-        >
-          {t('row.contact')}
-        </CustomButton>
+        {alreadyContacted ? (
+          <Text>{t('row.alreadyContacted')}</Text>
+        ) : (
+          <CustomButton
+            color={Color.Secondary}
+            variant={Variant.Outlined}
+            onClick={handleOnClick}
+          >
+            {t('row.contact')}
+          </CustomButton>
+        )}
       </TableCell>
     </TableRow>
   );
@@ -177,7 +189,7 @@ export const PublicExaminerListing = () => {
         <Paper elevation={3} className="public-examiner-listing">
           <div className="columns">
             <div className="grow">
-              <H2>Ota yhteyttä tutkinnon vastaanottajiin</H2>
+              <H2>Ota yhteyttä tutkintosuorituksen vastaanottajiin</H2>
             </div>
           </div>
           <LanguageFilter

diff --git a/frontend/packages/vkt/src/redux/reducers/publicEnrollmentContact.ts b/frontend/packages/vkt/src/redux/reducers/publicEnrollmentContact.ts
@@ -1,5 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { APIResponseStatus } from 'shared/enums';
+import { WithId } from 'shared/interfaces';
 
 import { PublicEnrollmentContact } from 'interfaces/publicEnrollment';
 import { PublicExaminer } from 'interfaces/publicExaminer';
@@ -11,6 +12,7 @@ export interface PublicEnrollmentContactState {
   cancelStatus: APIResponseStatus;
   enrollment: PublicEnrollmentContact;
   examiner?: PublicExaminer;
+  contactedExaminers: Array<WithId>;
 }
 
 const initialState: PublicEnrollmentContactState = {
@@ -33,6 +35,7 @@ const initialState: PublicEnrollmentContactState = {
     message: '',
   },
   examiner: undefined,
+  contactedExaminers: [],
 };
 
 const publicEnrollmentContactSlice = createSlice({
@@ -55,6 +58,9 @@ const publicEnrollmentContactSlice = createSlice({
     ) {
       state.enrollment = { ...state.enrollment, ...action.payload };
     },
+    markExaminerAsContacted(state, action: PayloadAction<WithId>) {
+      state.contactedExaminers = [...state.contactedExaminers, action.payload];
+    },
     loadPublicEnrollmentSave(
       state,
       _action: PayloadAction<{
@@ -87,4 +93,5 @@ export const {
   loadPublicExaminer,
   updatePublicEnrollmentContact,
   resetPublicEnrollmentContact,
+  markExaminerAsContacted,
 } = publicEnrollmentContactSlice.actions;
diff --git a/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts b/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts
@@ -10,6 +10,7 @@ import { setAPIError } from 'redux/reducers/APIError';
 import {
   loadPublicEnrollmentSave,
   loadPublicExaminer,
+  markExaminerAsContacted,
   rejectPublicEnrollmentSave,
   rejectPublicExaminer,
   storePublicEnrollmentSave,
@@ -57,6 +58,7 @@ function* loadPublicEnrollmentSaveSaga(
     yield call(axiosInstance.post, saveUrl, body);
 
     yield put(storePublicEnrollmentSave());
+    yield put(markExaminerAsContacted({ id: examinerId }));
   } catch (error) {
     const errorMessage = NotifierUtils.getAPIErrorMessage(error as AxiosError);
     yield put(setAPIError(errorMessage));