Merge pull request #2640 from pie-framework/fix/PD-5025

fix(image-cloze-association): get rid of correctResponse from model i…

Author: CarlaCostea

packages/drag-in-the-blank/controller/src/__tests__/index.test.js

@@ -52,36 +52,36 @@ describe('controller', () => {
     describe('correctResponse behavior across modes', () => {
       it('does not include correctResponse in gather mode', async () => {
         const result = await model(question, {}, { mode: 'gather' });
-    
+
         expect(result.correctResponse).toBeUndefined();
       });
-    
+
       it('includes correctResponse in view mode for instructor', async () => {
         const result = await model(question, {}, { mode: 'view', role: 'instructor' });
-    
-        expect(result.correctResponse).toBeDefined();
+
+        expect(result.correctResponse).toBeUndefined();
       });
-    
+
       it('does not include correctResponse in view mode for student', async () => {
         const result = await model(question, {}, { mode: 'view', role: 'student' });
-    
+
         expect(result.correctResponse).toBeUndefined();
       });
-    
+
       it('includes correctResponse in evaluate mode', async () => {
         const result = await model(question, {}, { mode: 'evaluate' });
-    
+
         expect(result.correctResponse).toBeDefined();
       });
-    
+
       it('ensures correctResponse is explicitly undefined when not in evaluate mode or instructor view', async () => {
         const gatherResult = await model(question, {}, { mode: 'gather' });
         const viewStudentResult = await model(question, {}, { mode: 'view', role: 'student' });
-    
+
         expect(gatherResult.correctResponse).toBeUndefined();
         expect(viewStudentResult.correctResponse).toBeUndefined();
       });
-    });    
+    });
 
     const assertGather = (label, extra, session, expected) => {
       it(`'mode: gather, ${label}'`, async () => {
@@ -164,7 +164,7 @@ describe('controller', () => {
           disabled: true,
           feedback: {},
           responseCorrect: undefined,
-          correctResponse: q.correctResponse,
+          correctResponse: undefined,
           ...expected,
         });
       });

packages/drag-in-the-blank/controller/src/index.js

@@ -59,7 +59,7 @@ export function model(question, session, env, updateSession) {
       choices = await getShuffledChoices(choices, session, updateSession, 'id');
     }
 
-    const shouldIncludeCorrectResponse = env.mode === 'evaluate' || (env.role === 'instructor' && env.mode === 'view');
+    const shouldIncludeCorrectResponse = env.mode === 'evaluate';
 
     const out = {
       ...normalizedQuestion,
@@ -68,7 +68,7 @@ export function model(question, session, env, updateSession) {
       feedback,
       mode: env.mode,
       disabled: env.mode !== 'gather',
-      responseCorrect: env.mode === 'evaluate' ? getScore(normalizedQuestion, session) === 1 : undefined,
+      responseCorrect: shouldIncludeCorrectResponse ? getScore(normalizedQuestion, session) === 1 : undefined,
       correctResponse: shouldIncludeCorrectResponse ? normalizedQuestion.correctResponse : undefined,
     };
 

packages/image-cloze-association/controller/src/__tests__/index.test.js

@@ -546,32 +546,32 @@ describe('controller', () => {
   describe('validation property behavior across modes', () => {
     it('does not include validation in gather mode', async () => {
       const result = await model(question, {}, { mode: 'gather' });
-  
+
       expect(result.validation).toBeUndefined();
     });
-  
+
     it('does not include validation in view mode', async () => {
       const result = await model(question, {}, { mode: 'view' });
-  
+
       expect(result.validation).toBeUndefined();
     });
-  
+
     it('includes validation in evaluate mode and when instructor is in view mode', async () => {
       const evalResult = await model(question, {}, { mode: 'evaluate' });
       const viewResult = await model(question, {}, { mode: 'view', role: 'instructor' });
-    
+
       expect(evalResult.validation).toBeDefined();
-      expect(viewResult.validation).toBeDefined();
-    });    
-  
+      expect(viewResult.validation).toBeUndefined();
+    });
+
     it('ensures validation is explicitly undefined when not in evaluate or instructor view mode', async () => {
       const gatherResult = await model(question, {}, { mode: 'gather' });
       const studentViewResult = await model(question, {}, { mode: 'view', role: 'student' });
-    
+
       expect(gatherResult.validation).toBeUndefined();
       expect(studentViewResult.validation).toBeUndefined();
-    });    
-  });  
+    });
+  });
 
   describe('getPartialScore', () => {
     const returnPartialScore = (sess) => {

packages/image-cloze-association/controller/src/index.js

@@ -15,7 +15,7 @@ export const model = (question, session, env) => {
   const questionCamelized = camelizeKeys(questionNormalized);
 
   return new Promise((resolve) => {
-    const shouldIncludeCorrectResponse = env.mode === 'evaluate' || (env.role === 'instructor' && env.mode === 'view');
+    const shouldIncludeCorrectResponse = env.mode === 'evaluate';
 
     const out = {
       disabled: env.mode !== 'gather',