[MBL-19842][Parent] Always show Front Page tab if it has content

kristofnemere · claude · kristofnemere · commit c393f18bb838 · 2026-03-18T16:17:06.000+01:00
The parent app was only showing the Front Page tab when the course home
was set to Wiki/Front Page. For Canvas for Elementary courses, the home
setting can't be changed back once modified, so the Front Page tab was
never shown even though a front page existed.

Fix: fetch the front page and show the tab whenever it has content,
regardless of the course home setting. Also decouple syllabus visibility
from front page visibility so both tabs can appear independently.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt
@@ -18,6 +18,7 @@
 package com.instructure.parentapp.di.feature
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.parentapp.features.courses.details.CourseDetailsRepository
 import dagger.Module
@@ -33,8 +34,9 @@ class CourseDetailsModule {
     @Provides
     fun provideCourseDetailsRepository(
         courseApi: CourseAPI.CoursesInterface,
-        tabsInterface: TabAPI.TabsInterface
+        tabsInterface: TabAPI.TabsInterface,
+        pageApi: PageAPI.PagesInterface
     ): CourseDetailsRepository {
-        return CourseDetailsRepository(courseApi, tabsInterface)
+        return CourseDetailsRepository(courseApi, tabsInterface, pageApi)
     }
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt
@@ -18,16 +18,19 @@
 package com.instructure.parentapp.features.courses.details
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.canvasapi2.builders.RestParams
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 
 
 class CourseDetailsRepository(
     private val courseApi: CourseAPI.CoursesInterface,
-    private val tabApi: TabAPI.TabsInterface
+    private val tabApi: TabAPI.TabsInterface,
+    private val pageApi: PageAPI.PagesInterface
 ) {
 
     suspend fun getCourse(id: Long, forceRefresh: Boolean): Course {
@@ -39,4 +42,9 @@ class CourseDetailsRepository(
         val params = RestParams(isForceReadFromNetwork = forceRefresh)
         return tabApi.getTabs(id, CanvasContext.Type.COURSE.apiString, params).dataOrThrow
     }
+
+    suspend fun getFrontPage(courseId: Long, forceRefresh: Boolean): Page? {
+        val params = RestParams(isForceReadFromNetwork = forceRefresh)
+        return pageApi.getFrontPage(CanvasContext.Type.COURSE.apiString, courseId, params).dataOrNull
+    }
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt
@@ -79,18 +79,18 @@ class CourseDetailsViewModel @Inject constructor(
 
             val course = repository.getCourse(courseId, forceRefresh)
             val tabs = repository.getCourseTabs(courseId, forceRefresh)
+            val frontPage = repository.getFrontPage(courseId, forceRefresh)
 
-            val hasHomePageAsFrontPage = course.homePage == Course.HomePage.HOME_WIKI
+            val showFrontPageTab = !frontPage?.body.isNullOrEmpty()
 
             val showSyllabusTab = !course.syllabusBody.isNullOrEmpty() &&
-                    (course.homePage == Course.HomePage.HOME_SYLLABUS ||
-                            (!hasHomePageAsFrontPage && tabs.any { it.tabId == Tab.SYLLABUS_ID }))
+                    (course.homePage == Course.HomePage.HOME_SYLLABUS || tabs.any { it.tabId == Tab.SYLLABUS_ID })
 
             val showSummary = showSyllabusTab && course.settings?.courseSummary.orDefault()
 
             val tabTypes = buildList {
                 add(TabType.GRADES)
-                if (hasHomePageAsFrontPage) add(TabType.FRONT_PAGE)
+                if (showFrontPageTab) add(TabType.FRONT_PAGE)
                 if (showSyllabusTab) add(TabType.SYLLABUS)
                 if (showSummary) add(TabType.SUMMARY)
             }
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt
@@ -18,10 +18,12 @@
 package com.instructure.parentapp.features.courses.details
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.canvasapi2.builders.RestParams
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 import com.instructure.canvasapi2.utils.DataResult
 import io.mockk.coEvery
@@ -35,8 +37,9 @@ class CourseDetailsRepositoryTest {
 
     private val courseApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
     private val tabApi: TabAPI.TabsInterface = mockk(relaxed = true)
+    private val pageApi: PageAPI.PagesInterface = mockk(relaxed = true)
 
-    private val repository = CourseDetailsRepository(courseApi, tabApi)
+    private val repository = CourseDetailsRepository(courseApi, tabApi, pageApi)
 
     @Test
     fun `Get course details successfully returns data`() = runTest {
@@ -85,4 +88,34 @@ class CourseDetailsRepositoryTest {
 
         repository.getCourseTabs(1L, true)
     }
+
+    @Test
+    fun `Get front page successfully returns page`() = runTest {
+        val expected = Page(body = "Front page content")
+
+        coEvery {
+            pageApi.getFrontPage(
+                CanvasContext.Type.COURSE.apiString,
+                1L,
+                RestParams(isForceReadFromNetwork = false)
+            )
+        } returns DataResult.Success(expected)
+
+        val result = repository.getFrontPage(1L, false)
+        Assert.assertEquals(expected, result)
+    }
+
+    @Test
+    fun `Get front page returns null when fails`() = runTest {
+        coEvery {
+            pageApi.getFrontPage(
+                CanvasContext.Type.COURSE.apiString,
+                1L,
+                RestParams(isForceReadFromNetwork = false)
+            )
+        } returns DataResult.Fail()
+
+        val result = repository.getFrontPage(1L, false)
+        Assert.assertNull(result)
+    }
 }
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt
@@ -25,6 +25,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.SavedStateHandle
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.type.EnrollmentType
@@ -98,8 +99,9 @@ class CourseDetailsViewModelTest {
 
     @Test
     fun `Load course details with front page tab`() = runTest {
-        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1", homePage = Course.HomePage.HOME_WIKI)
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
         coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
 
         createViewModel()
 
@@ -115,6 +117,92 @@ class CourseDetailsViewModelTest {
         Assert.assertEquals(expected, viewModel.uiState.value)
     }
 
+    @Test
+    fun `Front page tab not shown when front page body is empty`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab not shown when no front page`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns null
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab shown when default view is not front page`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1", homePage = Course.HomePage.HOME_ASSIGNMENTS)
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES, TabType.FRONT_PAGE),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab shown alongside syllabus tab`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(
+            id = 1,
+            name = "Course 1",
+            homePage = Course.HomePage.HOME_SYLLABUS,
+            syllabusBody = "Syllabus body"
+        )
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab(Tab.SYLLABUS_ID))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES, TabType.FRONT_PAGE, TabType.SYLLABUS),
+            syllabus = "Syllabus body",
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
     @Test
     fun `Load course details with syllabus tab`() = runTest {
         coEvery { repository.getCourse(1, any()) } returns Course(
