[MBL-19397][Parent] Observers unable to see Quiz submission feedback when "Assignment Enhancements" feature option is enable

apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsRouter.kt

@@ -47,13 +47,14 @@ class ParentAssignmentDetailsRouter(
         assignmentUrl: String?,
         isAssignmentEnhancementEnabled: Boolean,
         isObserver: Boolean,
-        initialSelectedSubmissionAttempt: Long?
+        initialSelectedSubmissionAttempt: Long?,
+        isQuiz: Boolean
     ) {
         assignmentUrl ?: return
         val parentId = apiPrefs.user?.id ?: return
         val currentStudentId = parentPrefs.currentStudent?.id ?: return
         val cookies = mapOf("k5_observed_user_for_$parentId" to "$currentStudentId")
-        val url = if (isAssignmentEnhancementEnabled) {
+        val url = if (isAssignmentEnhancementEnabled && !isQuiz) {
             assignmentUrl
         } else {
             "$assignmentUrl/submissions/$currentStudentId"

apps/student/src/main/java/com/instructure/student/features/assignments/details/StudentAssignmentDetailsRouter.kt

@@ -59,7 +59,8 @@ class StudentAssignmentDetailsRouter: AssignmentDetailsRouter() {
         assignmentUrl: String?,
         isAssignmentEnhancementEnabled: Boolean,
         isObserver: Boolean,
-        initialSelectedSubmissionAttempt: Long?
+        initialSelectedSubmissionAttempt: Long?,
+        isQuiz: Boolean
     ) {
         RouteMatcher.route(
             activity,

libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Assignment.kt

@@ -253,6 +253,10 @@ data class Assignment(
         } ?: LtiType.EXTERNAL_TOOL
     }
 
+    fun isQuiz(): Boolean {
+        return getSubmissionTypes().contains(SubmissionType.ONLINE_QUIZ) || ltiToolType() == LtiType.NEW_QUIZZES_LTI
+    }
+
     companion object {
 
         const val PASS_FAIL_TYPE = "pass_fail"

libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/AssignmentTest.kt

@@ -290,4 +290,38 @@ class AssignmentTest {
     }
     //endregion
 
+    //region isQuiz
+    @Test
+    fun isQuiz_TestOnlineQuiz() {
+        val assignment = Assignment(submissionTypesRaw = listOf("online_quiz"))
+        assertEquals(true, assignment.isQuiz())
+    }
+
+    @Test
+    fun isQuiz_TestQuizLtiAssignment() {
+        val externalToolAttributes = ExternalToolAttributes(url = "https://example.com/quiz-lti/launch")
+        val assignment = Assignment(
+            submissionTypesRaw = listOf("external_tool"),
+            externalToolAttributes = externalToolAttributes
+        )
+        assertEquals(true, assignment.isQuiz())
+    }
+
+    @Test
+    fun isQuiz_TestRegularExternalTool() {
+        val externalToolAttributes = ExternalToolAttributes(url = "https://example.com/tool/launch")
+        val assignment = Assignment(
+            submissionTypesRaw = listOf("external_tool"),
+            externalToolAttributes = externalToolAttributes
+        )
+        assertEquals(false, assignment.isQuiz())
+    }
+
+    @Test
+    fun isQuiz_TestNonQuizSubmissionType() {
+        val assignment = Assignment(submissionTypesRaw = listOf("online_upload"))
+        assertEquals(false, assignment.isQuiz())
+    }
+    //endregion
+
 }

libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsFragment.kt

@@ -215,7 +215,8 @@ class AssignmentDetailsFragment : BaseCanvasFragment(), FragmentInteractions, Bo
                     action.assignmentUrl,
                     action.isAssignmentEnhancementEnabled,
                     action.isObserver,
-                    action.selectedSubmissionAttempt
+                    action.selectedSubmissionAttempt,
+                    action.isQuiz
                 )
             }
             is AssignmentDetailAction.NavigateToQuizScreen -> {

libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsRouter.kt

@@ -40,7 +40,8 @@ open class AssignmentDetailsRouter {
         assignmentUrl: String?,
         isAssignmentEnhancementEnabled: Boolean,
         isObserver: Boolean = false,
-        initialSelectedSubmissionAttempt: Long? = null
+        initialSelectedSubmissionAttempt: Long? = null,
+        isQuiz: Boolean = false
     ) = Unit
 
     open fun navigateToQuizScreen(activity: FragmentActivity, canvasContext: CanvasContext, quiz: Quiz, url: String) = Unit

libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsViewData.kt

@@ -70,7 +70,8 @@ sealed class AssignmentDetailAction {
         val isObserver: Boolean,
         val selectedSubmissionAttempt: Long?,
         val assignmentUrl: String?,
-        val isAssignmentEnhancementEnabled: Boolean
+        val isAssignmentEnhancementEnabled: Boolean,
+        val isQuiz: Boolean
     ) : AssignmentDetailAction()
     data class NavigateToQuizScreen(val quiz: Quiz) : AssignmentDetailAction()
     data class NavigateToDiscussionScreen(val discussionTopicHeaderId: Long, val course: Course) : AssignmentDetailAction()

libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsViewModel.kt

@@ -246,7 +246,8 @@ class AssignmentDetailsViewModel @Inject constructor(
                                 isObserver,
                                 submission.attempt,
                                 assignmentResult.htmlUrl,
-                                isAssignmentEnhancementEnabled
+                                isAssignmentEnhancementEnabled,
+                                assignmentResult.isQuiz()
                             )
                         )
                     }
@@ -547,7 +548,8 @@ class AssignmentDetailsViewModel @Inject constructor(
                     isObserver,
                     selectedSubmission?.attempt,
                     assignment?.htmlUrl,
-                    isAssignmentEnhancementEnabled
+                    isAssignmentEnhancementEnabled,
+                    assignment?.isQuiz() == true
                 )
             )
         }

libs/pandautils/src/test/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsViewModelTest.kt

@@ -496,7 +496,8 @@ class AssignmentDetailsViewModelTest {
             isObserver = false,
             selectedSubmissionAttempt = null,
             assignmentUrl = "https://assignment.url",
-            isAssignmentEnhancementEnabled = true
+            isAssignmentEnhancementEnabled = true,
+            isQuiz = false
         )
         assertEquals(expected, viewModel.events.value?.peekContent())
     }
@@ -1029,7 +1030,8 @@ class AssignmentDetailsViewModelTest {
             isObserver = false,
             selectedSubmissionAttempt = 2L,
             assignmentUrl = "https://assignment.url",
-            isAssignmentEnhancementEnabled = true
+            isAssignmentEnhancementEnabled = true,
+            isQuiz = false
         )
         assertEquals(expected, viewModel.events.value?.peekContent())
     }