Loading resources from workbook

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/ui/resources/view/ResourceListFragment.kt

@@ -20,8 +20,8 @@ class ResourceListFragment : Fragment() {
 
         add(
             workbookheader {
-                labelText = viewModel.chapter.title + " Resources"
-                filterText = "Hide Completed"
+                labelText = "${viewModel.chapter.title} ${messages["resources"]}"
+                filterText = messages["hideCompleted"]
             }
         )
         add(

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/ui/resources/viewmodel/ResourcesViewModel.kt

@@ -1,13 +1,11 @@
 package org.wycliffeassociates.otter.jvm.app.ui.resources.viewmodel
 
+import io.reactivex.Observable
 import javafx.application.Platform
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.property.SimpleStringProperty
-import javafx.collections.FXCollections
-import javafx.collections.ObservableList
 import org.wycliffeassociates.otter.common.data.workbook.*
-import org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model.ResourceCardItem
-import org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model.ResourceGroupCardItem
+import org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model.ResourceGroupCardItemList
 import org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model.resourceGroupCardItem
 import tornadofx.*
 
@@ -24,18 +22,22 @@ class ResourcesViewModel : ViewModel() {
     val resourceSlug: String
         get() = activeResourceSlugProperty.value
 
-    var resourceGroups: ObservableList<ResourceGroupCardItem> = FXCollections.observableArrayList()
+    var resourceGroups: ResourceGroupCardItemList = ResourceGroupCardItemList(mutableListOf())
+
+    fun <T, R:Any> Observable<T>.mapNotNull(f: (T) -> R?): Observable<R> =
+        concatMapIterable { listOfNotNull(f(it)) }
 
     fun loadResourceGroups() {
-        chapter.chunks.map { chunk ->
-            resourceGroupCardItem(chunk, resourceSlug) { navigateToTakesPage(it) }
-        }.startWith(
-            resourceGroupCardItem(chapter, resourceSlug) { navigateToTakesPage(it) }
-        ).buffer(2).subscribe { // Buffering by 2 prevents the list UI from jumping while groups are loading
-            Platform.runLater {
-                resourceGroups.addAll(it)
+        chapter
+            .children
+            .startWith(chapter)
+            .mapNotNull { resourceGroupCardItem(it, resourceSlug, onSelect = this::navigateToTakesPage) }
+            .buffer(2) // Buffering by 2 prevents the list UI from jumping while groups are loading
+            .subscribe {
+                Platform.runLater {
+                    resourceGroups.addAll(it)
+                }
             }
-        }
     }
 
     private fun navigateToTakesPage(resource: Resource) {

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/widgets/resourcecard/model/ResourceCardItem.kt

@@ -1,5 +1,6 @@
 package org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model
 
+import io.reactivex.disposables.CompositeDisposable
 import javafx.beans.property.DoubleProperty
 import javafx.beans.property.SimpleDoubleProperty
 import org.wycliffeassociates.otter.common.data.workbook.AssociatedAudio
@@ -8,16 +9,22 @@ import org.commonmark.parser.Parser
 import org.commonmark.renderer.text.TextContentRenderer
 
 data class ResourceCardItem(val resource: Resource, val onSelect: () -> Unit) {
-    val title: String = getTitleTextContent()
+    val title: String = renderTitleAsPlainText()
+    private val disposables = CompositeDisposable()
     val titleProgressProperty: DoubleProperty = resource.titleAudio.progressProperty()
     val bodyProgressProperty: DoubleProperty? = resource.bodyAudio?.progressProperty()
     val hasBodyAudio: Boolean = resource.bodyAudio != null
 
+    fun clearDisposables() {
+        disposables.clear()
+    }
+
     private fun AssociatedAudio.progressProperty(): DoubleProperty {
         val progressProperty = SimpleDoubleProperty(0.0)
-        this.selected.subscribe {
+        val sub = this.selected.subscribe {
             progressProperty.set( if (it.value != null) 1.0 else 0.0)
         }
+        disposables.add(sub)
         return progressProperty
     }
 
@@ -26,7 +33,7 @@ data class ResourceCardItem(val resource: Resource, val onSelect: () -> Unit) {
         val renderer: TextContentRenderer = TextContentRenderer.builder().build()
     }
 
-    private fun getTitleTextContent(): String {
+    private fun renderTitleAsPlainText(): String {
         val document = parser.parse(resource.title.text)
         return renderer.render(document)
     }

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/widgets/resourcecard/model/ResourceGroupCardItem.kt

@@ -2,11 +2,19 @@ package org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model
 
 import io.reactivex.Observable
 import org.wycliffeassociates.otter.common.data.workbook.*
+import tornadofx.*
+import tornadofx.FX.Companion.messages
 
 data class ResourceGroupCardItem(
     val title: String,
     val resources: Observable<ResourceCardItem>
-)
+) {
+    fun onRemove() {
+        resources.forEach {
+            it.clearDisposables()
+        }
+    }
+}
 
 fun resourceGroupCardItem(element: BookElement, slug: String, onSelect: (Resource) -> Unit): ResourceGroupCardItem? {
     return findResourceGroup(element, slug)?.let { rg ->
@@ -25,8 +33,8 @@ private fun findResourceGroup(element: BookElement, slug: String): ResourceGroup
 
 private fun getGroupTitle(element: BookElement): String {
     return when (element) {
-        is Chapter -> "Chapter " + element.title
-        is Chunk -> "Chunk " + element.title
+        is Chapter -> "${messages["chapter"]} ${element.title}"
+        is Chunk -> "${messages["chunk"]} ${element.title}"
         else -> element.title
     }
 }

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/widgets/resourcecard/model/ResourceGroupCardItemList.kt

@@ -0,0 +1,22 @@
+package org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model
+
+import com.sun.javafx.collections.ObservableListWrapper
+import javafx.collections.ListChangeListener
+
+class ResourceGroupCardItemList(list: List<ResourceGroupCardItem>) :
+    ObservableListWrapper<ResourceGroupCardItem>(list) {
+
+    init {
+        addListener(
+            ListChangeListener<ResourceGroupCardItem> {
+                while(it.next()) {
+                    if (it.wasRemoved()) {
+                        it.removed.forEach { item ->
+                            item.onRemove()
+                        }
+                    }
+                }
+            }
+        )
+    }
+}

src/main/kotlin/org/wycliffeassociates/otter/jvm/app/widgets/resourcecard/view/ResourceGroupCard.kt

@@ -6,13 +6,14 @@ import org.wycliffeassociates.otter.jvm.app.widgets.resourcecard.model.ResourceG
 import tornadofx.*
 
 class ResourceGroupCard(group: ResourceGroupCardItem) : VBox() {
+    private val RENDER_BATCH_SIZE = 10
     init {
         importStylesheet<ResourceGroupCardStyles>()
 
         addClass(ResourceGroupCardStyles.resourceGroupCard)
         label(group.title)
 
-        group.resources.buffer(10).subscribe { items ->
+        group.resources.buffer(RENDER_BATCH_SIZE).subscribe { items ->
             Platform.runLater {
                 items.forEach {
                     add(

src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/repositories/ResourceRepository.kt

@@ -89,58 +89,40 @@ class ResourceRepository(private val database: AppDatabase) : IResourceRepositor
             .map(this::buildResourceInfo)
     }
 
-    /**
-     * Returns all resources for which the resource content's COLLECTION_FK field references this collection.
-     * This will return resources about the chapter as well as all resources about the chapter's chunks.
-     */
-    override fun getResourcesForCollectionAndChildren(
-        collection: Collection,
-        resourceInfo: ResourceInfo
-    ): Observable<Content> {
-        return getResources({ table -> table.COLLECTION_FK.eq(collection.id) }, resourceInfo)
-    }
-
     override fun getResources(content: Content, resourceInfo: ResourceInfo): Observable<Content> {
-        return getResources({ table -> table.ID.eq(content.id) }, resourceInfo)
-    }
-
-    /**
-     * Returns collection-specific resources
-     */
-    override fun getResources(collection: Collection, resourceInfo: ResourceInfo): Observable<Content> {
         val metadata = mapToResourceMetadataEntity[resourceInfo]
             ?: return Observable.empty()
 
+        val main = CONTENT_ENTITY.`as`("main")
         val help = CONTENT_ENTITY.`as`("help")
 
         val selectStatement = database.dsl
             .selectDistinct(help.asterisk())
             .from(RESOURCE_LINK)
-            .join(COLLECTION_ENTITY).on(COLLECTION_ENTITY.ID.eq(RESOURCE_LINK.COLLECTION_FK))
-            .join(help).on(RESOURCE_LINK.RESOURCE_CONTENT_FK.eq(help.ID))
+            .join(main).on(main.ID.eq(RESOURCE_LINK.CONTENT_FK))
+            .join(help).on(help.ID.eq(RESOURCE_LINK.RESOURCE_CONTENT_FK))
             .where(RESOURCE_LINK.DUBLIN_CORE_FK.eq(metadata.id))
-            .and(COLLECTION_ENTITY.ID.eq(collection.id))
+            .and(main.ID.eq(content.id))
 
         return getResources(help, selectStatement)
     }
 
-    private fun getResources(
-        condition: (jooq.tables.ContentEntity) -> Condition,
-        resourceInfo: ResourceInfo
-    ): Observable<Content> {
+    /**
+     * Returns collection-specific resources (does not return resources about the collection's children.)
+     */
+    override fun getResources(collection: Collection, resourceInfo: ResourceInfo): Observable<Content> {
         val metadata = mapToResourceMetadataEntity[resourceInfo]
             ?: return Observable.empty()
 
-        val main = CONTENT_ENTITY.`as`("main")
         val help = CONTENT_ENTITY.`as`("help")
 
         val selectStatement = database.dsl
             .selectDistinct(help.asterisk())
             .from(RESOURCE_LINK)
-            .join(main).on(main.ID.eq(RESOURCE_LINK.CONTENT_FK))
-            .join(help).on(help.ID.eq(RESOURCE_LINK.RESOURCE_CONTENT_FK))
+            .join(COLLECTION_ENTITY).on(COLLECTION_ENTITY.ID.eq(RESOURCE_LINK.COLLECTION_FK))
+            .join(help).on(RESOURCE_LINK.RESOURCE_CONTENT_FK.eq(help.ID))
             .where(RESOURCE_LINK.DUBLIN_CORE_FK.eq(metadata.id))
-            .and(condition(main))
+            .and(COLLECTION_ENTITY.ID.eq(collection.id))
 
         return getResources(help, selectStatement)
     }

src/main/resources/Messages_en.properties

@@ -14,6 +14,7 @@ viewTakes =VIEW TAKES
 viewRecordings = VIEW RECORDINGS
 edit = EDIT
 chapter = Chapter
+chunk = Chunk
 verse=Verse
 take=Take
 select = Select
@@ -74,3 +75,5 @@ selectBook = Select a Book
 home = Home
 profile = Profile
 settings = Settings
+resources = Resources
+hideCompleted = Hide Completed