Merge pull request #401 from modelix/issue/MODELIX-701

MODELIX-701 Content explorer shows no content

Author: mhuster23

api/model-server-html.yaml

@@ -59,7 +59,7 @@ paths:
             type: string
       requestBody:
         content:
-          '*/*':
+          'application/json':
             schema:
               $ref: "#/components/schemas/ContentExplorerExpandedNodes"
         required: true
@@ -244,8 +244,6 @@ components:
             type: string
         expandAll:
           type: boolean
-      required:
-        - "expandedNodeIds"
     Function1:
       type: object
       properties: {}

gradle/libs.versions.toml

@@ -96,6 +96,7 @@ jcommander = { group = "com.beust", name = "jcommander", version = "1.82" }
 cucumber-java = { group = "io.cucumber", name = "cucumber-java", version = "7.15.0" }
 junit = { group = "junit", name = "junit", version = "4.13.2" }
 xmlunit-core = { group = "org.xmlunit", name = "xmlunit-core", version = "2.9.1"}
+jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.2" }
 
 apache-cxf-sse = { group = "org.apache.cxf", name = "cxf-rt-rs-sse", version.ref = "apacheCxf" }
 apache-cxf-client = { group = "org.apache.cxf", name = "cxf-rt-rs-client", version.ref = "apacheCxf" }

model-server/build.gradle.kts

@@ -67,6 +67,7 @@ dependencies {
     testImplementation(libs.cucumber.java)
     testImplementation(libs.ktor.server.test.host)
     testImplementation(libs.kotlin.coroutines.test)
+    testImplementation(libs.jsoup)
     testImplementation(kotlin("test"))
     testImplementation(project(":modelql-untyped"))
 }

model-server/src/test/kotlin/org/modelix/model/server/handlers/ContentExplorerTest.kt

@@ -19,25 +19,32 @@ package org.modelix.model.server.handlers
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.ContentType
+import io.ktor.http.contentType
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.resources.Resources
 import io.ktor.server.routing.IgnoreTrailingSlash
 import io.ktor.server.testing.ApplicationTestBuilder
 import io.ktor.server.testing.testApplication
 import io.ktor.server.websocket.WebSockets
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.jsoup.select.Evaluator
 import org.modelix.model.client.successful
 import org.modelix.model.lazy.CLVersion
 import org.modelix.model.server.api.v2.VersionDelta
 import org.modelix.model.server.store.InMemoryStoreClient
 import org.modelix.model.server.store.LocalModelClient
 import kotlin.test.Test
+import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation as ClientContentNegotiation
 
 class ContentExplorerTest {
 
-    private val repoId = "test-repo"
     private val modelClient = LocalModelClient(InMemoryStoreClient())
     private val repoManager = RepositoriesManager(modelClient)
 
@@ -62,7 +69,7 @@ class ContentExplorerTest {
             install(ClientContentNegotiation) { json() }
         }
 
-        val delta: VersionDelta = client.post("/v2/repositories/$repoId/init").body()
+        val delta: VersionDelta = client.post("/v2/repositories/node-inspector/init").body()
 
         val versionHash = delta.versionHash
         val version = CLVersion.loadFromHash(versionHash, modelClient.storeCache)
@@ -71,4 +78,33 @@ class ContentExplorerTest {
         val response = client.get("/content/$versionHash/$nodeId/")
         assertTrue(response.successful)
     }
+
+    @Test
+    fun `nodes can be expanded`() = runTest {
+        val client = createClient {
+            install(ClientContentNegotiation) { json() }
+        }
+
+        val delta: VersionDelta = client.post("/v2/repositories/node-expansion/init").body()
+
+        val versionHash = delta.versionHash
+        val version = CLVersion.loadFromHash(versionHash, modelClient.storeCache)
+        val nodeId = checkNotNull(version.getTree().root?.id)
+
+        val expandedNodes = ContentExplorerExpandedNodes(setOf(nodeId.toString()), false)
+
+        val response = client.post("/content/$versionHash/") {
+            contentType(ContentType.Application.Json)
+            setBody(expandedNodes)
+        }
+
+        val html = Jsoup.parse(response.bodyAsText())
+        val root: Element? = html.body().firstElementChild()
+
+        assertTrue { response.successful }
+        assertNotNull(root)
+        assertTrue { root.`is`(Evaluator.Tag("ul")) }
+        assertTrue { root.`is`(Evaluator.Class("treeRoot")) }
+        assertTrue { root.childrenSize() > 0 }
+    }
 }