From fe4680646e7d27f3a2d8e254e957856b4e727c58 Mon Sep 17 00:00:00 2001
From: Kristin Aoki <kaoki@edx.org>
Date: Thu, 12 Aug 2021 16:18:40 -0400
Subject: [PATCH] Update modelsSequenceId and modelsUnitId definitions

---
 src/courseware/data/thunks.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/courseware/data/thunks.js b/src/courseware/data/thunks.js
index 7a86c79d..ea249c06 100644
--- a/src/courseware/data/thunks.js
+++ b/src/courseware/data/thunks.js
@@ -268,21 +268,20 @@ export function fetchSequence(sequenceId) {
 export function checkBlockCompletion(courseId, sequenceId, unitId) {
   return async (dispatch, getState) => {
     const { models } = getState();
-    let modelsUnitId = models.units[unitId];
-    if (!modelsUnitId) {
+    let modelsUnitId = unitId;
+    let modelsSequenceId = sequenceId;
+    if (!models.units[unitId]) {
       modelsUnitId = models.unitIdToHashKeyMap[unitId];
     }
-    let modelSequenceId = models.sequences[sequenceId];
-    if (!modelSequenceId) {
-      modelSequenceId = models.sequenceIdToHashKeyMap[sequenceId];
+    if (!models.sequences[sequenceId]) {
+      modelsSequenceId = models.sequenceIdToHashKeyMap[sequenceId];
     }
-    if (modelsUnitId.complete) {
+    if (models.units[modelsUnitId].complete) {
       return; // do nothing. Things don't get uncompleted after they are completed.
     }
 
     try {
-      const isComplete = await getBlockCompletion(courseId, modelSequenceId,
-        modelsUnitId);
+      const isComplete = await getBlockCompletion(courseId, modelSequenceId, modelsUnitId);
       dispatch(updateModel({
         modelType: 'units',
         model: {
@@ -299,11 +298,11 @@ export function checkBlockCompletion(courseId, sequenceId, unitId) {
 export function saveSequencePosition(courseId, sequenceId, activeUnitIndex) {
   return async (dispatch, getState) => {
     const { models } = getState();
-    let modelSequenceId = models.sequences[sequenceId];
-    if (!modelSequenceId) {
+    let modelSequenceId = sequenceId;
+    if (!models.sequences[sequenceId]) {
       modelSequenceId = models.sequenceIdToHashKeyMap[sequenceId];
     }
-    const initialActiveUnitIndex = modelSequenceId.activeUnitIndex;
+    const initialActiveUnitIndex = models.sequences[modelSequenceId].activeUnitIndex;
     // Optimistically update the position.
     dispatch(updateModel({
       modelType: 'sequences',