diff --git a/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx b/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx index 1488bb76f..b59b40c71 100644 --- a/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx +++ b/frontend/packages/vkt/src/components/publicExaminerListing/PublicExaminerListing.tsx @@ -25,7 +25,7 @@ import { usePublicTranslation, } from 'configs/i18n'; import { useAppDispatch, useAppSelector } from 'configs/redux'; -import { ExamLanguage } from 'enums/app'; +import { AppRoutes, ExamLanguage } from 'enums/app'; import { PublicExaminer } from 'interfaces/publicExaminer'; import { setPublicExaminerLanguageFilter } from 'redux/reducers/publicExaminer'; import { @@ -98,7 +98,7 @@ const DesktopExaminerRow = ({ Ota yhteyttä diff --git a/frontend/packages/vkt/src/enums/app.ts b/frontend/packages/vkt/src/enums/app.ts index 22f94c3fa..ce5284129 100644 --- a/frontend/packages/vkt/src/enums/app.ts +++ b/frontend/packages/vkt/src/enums/app.ts @@ -6,6 +6,12 @@ const excellentLevelRoutePrefix = '/vkt/erinomainen-taito'; const excellentLevelEnrollmentRoute = excellentLevelRoutePrefix + '/ilmoittaudu'; +const goodAndSatisfactoryLevelRoutePrefix = '/vkt/hyva-ja-tyydyttava-taito'; +const goodAndSatisfactoryLevelEnrollmentRoute = + excellentLevelRoutePrefix + '/ilmoittaudu'; +const goodAndSatisfactoryLevelContactRoute = + goodAndSatisfactoryLevelRoutePrefix + '/ota-yhteytta'; + export enum AppRoutes { PublicRoot = '/vkt', PublicHomePage = '/vkt/etusivu', @@ -31,18 +37,26 @@ export enum AppRoutes { PublicEnrollmentDone = excellentLevelEnrollmentRoute + '/:examEventId/valmis', // Routes for good and satisfactory level - TODO - PublicGoodAndSatisfactoryLevelLanding = '/vkt/hyva-ja-tyydyttava-taito', - PublicEnrollmentAppointment = '/vkt/markkinapaikka', - PublicAuthAppointment = '/vkt/markkinapaikka/:enrollmentId/tunnistaudu', - PublicEnrollmentAppointmentContactDetails = '/vkt/markkinapaikka/:enrollmentId/tiedot', - PublicEnrollmentAppointmentPreview = '/vkt/markkinapaikka/:enrollmentId/esikatsele', - PublicEnrollmentAppointmentPaymentFail = '/vkt/markkinapaikka/:enrollmentId/maksu/peruutettu', - PublicEnrollmentAppointmentPaymentSuccess = '/vkt/markkinapaikka/:enrollmentId/maksu/valmis', - - PublicEnrollmentContact = '/vkt/markkinapaikka/ota-yhteytta', - PublicEnrollmentContactContactDetails = '/vkt/markkinapaikka/ota-yhteytta/:appointeeId/tiedot', - PublicEnrollmentContactSelectExam = '/vkt/markkinapaikka/ota-yhteytta/:appointeeId/tutkinto', - PublicEnrollmentContactDone = '/vkt/markkinapaikka/ota-yhteytta/:appointeeId/valmis', + PublicGoodAndSatisfactoryLevelLanding = goodAndSatisfactoryLevelRoutePrefix, + PublicEnrollmentAppointment = goodAndSatisfactoryLevelEnrollmentRoute, + PublicAuthAppointment = goodAndSatisfactoryLevelEnrollmentRoute + + '/:enrollmentId/tunnistaudu', + PublicEnrollmentAppointmentContactDetails = goodAndSatisfactoryLevelEnrollmentRoute + + '/:enrollmentId/tiedot', + PublicEnrollmentAppointmentPreview = goodAndSatisfactoryLevelEnrollmentRoute + + '/:enrollmentId/esikatsele', + PublicEnrollmentAppointmentPaymentFail = goodAndSatisfactoryLevelEnrollmentRoute + + '/:enrollmentId/maksu/peruutettu', + PublicEnrollmentAppointmentPaymentSuccess = goodAndSatisfactoryLevelEnrollmentRoute + + '/:enrollmentId/maksu/valmis', + + PublicEnrollmentContact = goodAndSatisfactoryLevelContactRoute, + PublicEnrollmentContactContactDetails = goodAndSatisfactoryLevelContactRoute + + '/:examinerId/tiedot', + PublicEnrollmentContactSelectExam = goodAndSatisfactoryLevelContactRoute + + '/:examinerId/tutkinto', + PublicEnrollmentContactDone = goodAndSatisfactoryLevelContactRoute + + '/:examinerId/valmis', // Routes for clerk user ClerkHomePage = '/vkt/virkailija', diff --git a/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts b/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts index 6955787de..fe5195d0b 100644 --- a/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts +++ b/frontend/packages/vkt/src/redux/sagas/publicEnrollmentContact.ts @@ -20,8 +20,8 @@ import { SerializationUtils } from 'utils/serialization'; function* loadPublicExamEventSaga(action: PayloadAction) { try { - const inspectorId = action.payload; - const loadUrl = `${APIEndpoints.PublicEnrollmentAppointment}/${inspectorId}`; + const examinerId = action.payload; + const loadUrl = `${APIEndpoints.PublicEnrollmentAppointment}/${examinerId}`; const response: AxiosResponse = yield call( axiosInstance.get,