Migrate to Redux Toolkit part 7

src/commons/achievement/AchievementOverview.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { AchievementUser } from 'src/features/achievement/AchievementTypes';
 
-import { FETCH_TOTAL_XP, FETCH_TOTAL_XP_ADMIN } from '../application/types/SessionTypes';
+import { fetchTotalXp, fetchTotalXpAdmin } from '../application/actions/SessionActions';
 import { useTypedSelector } from '../utils/Hooks';
 import AchievementLevel from './overview/AchievementLevel';
 
@@ -20,9 +20,9 @@ const AchievementOverview: React.FC<Props> = ({ name, userState }) => {
   useEffect(() => {
     // If user is student, fetch assessment details from assessment route instead, as seen below
     if (crid && crid !== userCrid) {
-      dispatch({ type: FETCH_TOTAL_XP_ADMIN, payload: crid });
+      dispatch(fetchTotalXpAdmin(crid));
     } else {
-      dispatch({ type: FETCH_TOTAL_XP });
+      dispatch(fetchTotalXp());
     }
   }, [crid, userCrid, dispatch]);
 

src/commons/achievement/AchievementView.tsx

@@ -9,8 +9,12 @@ import {
   getAbilityGlow
 } from '../../features/achievement/AchievementConstants';
 import { AchievementStatus, AchievementUser } from '../../features/achievement/AchievementTypes';
-import { FETCH_ASSESSMENT, FETCH_ASSESSMENT_ADMIN } from '../application/types/SessionTypes';
-import { Assessment, FETCH_ASSESSMENT_OVERVIEWS } from '../assessment/AssessmentTypes';
+import {
+  fetchAssessment,
+  fetchAssessmentAdmin,
+  fetchAssessmentOverviews
+} from '../application/actions/SessionActions';
+import { Assessment } from '../assessment/AssessmentTypes';
 import { useTypedSelector } from '../utils/Hooks';
 import AchievementCommentCard from './AchievementCommentCard';
 import { prettifyDate } from './utils/DateHelper';
@@ -36,16 +40,17 @@ const AchievementView: React.FC<Props> = ({ focusUuid, userState }) => {
 
   const dispatch = useDispatch();
   useEffect(() => {
-    dispatch({ type: FETCH_ASSESSMENT_OVERVIEWS });
+    dispatch(fetchAssessmentOverviews());
     if (!assessmentId) {
       return;
     }
     if (isAdminView) {
       // Fetch selected user's assessment from admin route
-      dispatch({ type: FETCH_ASSESSMENT_ADMIN, payload: { assessmentId, courseRegId } });
+      // Safe to use non-null assertion (refer to `isAdminView` declaration above)
+      dispatch(fetchAssessmentAdmin(assessmentId, courseRegId!));
     } else {
       // If user is student, fetch assessment details from assessment route instead, as seen below
-      dispatch({ type: FETCH_ASSESSMENT, payload: { assessmentId } });
+      dispatch(fetchAssessment(assessmentId));
     }
   }, [dispatch, assessmentId, courseRegId, isAdminView]);