fix(model-server): fix display of node references

Fixed the handling of unresolvable references and now shows target references if possible.

Author: mhuster23

model-server/src/main/kotlin/org/modelix/model/server/handlers/ContentExplorer.kt

@@ -29,6 +29,7 @@ import kotlinx.html.small
 import kotlinx.html.stream.appendHTML
 import kotlinx.html.style
 import kotlinx.html.table
+import kotlinx.html.tbody
 import kotlinx.html.td
 import kotlinx.html.th
 import kotlinx.html.thead
@@ -250,10 +251,12 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
                         th { +"Value" }
                     }
                 }
-                for (propertyRole in node.getPropertyRoles()) {
-                    tr {
-                        td { +propertyRole }
-                        td { +"${node.getPropertyValue(propertyRole)}" }
+                tbody {
+                    for (propertyRole in node.getPropertyRoles()) {
+                        tr {
+                            td { +propertyRole }
+                            td { +"${node.getPropertyValue(propertyRole)}" }
+                        }
                     }
                 }
             }
@@ -265,19 +268,21 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
                 thead {
                     tr {
                         th { +"ReferenceRole" }
-                        th { +"NodeId" }
-                        th { +"Value" }
+                        th { +"Target NodeId" }
+                        th { +"Target Reference" }
                     }
                 }
-                INodeResolutionScope.runWithAdditionalScope(node.getArea()) {
-                    for (referenceRole in node.getReferenceRoles()) {
-                        tr {
-                            td { +referenceRole }
-                            td {
-                                +"${(node.getReferenceTarget(referenceRole) as PNodeAdapter).nodeId}"
-                            }
-                            td {
-                                +"${node.getReferenceTarget(referenceRole)}"
+                tbody {
+                    INodeResolutionScope.runWithAdditionalScope(node.getArea()) {
+                        for (referenceRole in node.getReferenceRoles()) {
+                            tr {
+                                td { +referenceRole }
+                                td {
+                                    +"${(node.getReferenceTarget(referenceRole) as? PNodeAdapter)?.nodeId}"
+                                }
+                                td {
+                                    +"${node.getReferenceTargetRef(referenceRole)?.serialize()}"
+                                }
                             }
                         }
                     }

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

@@ -33,12 +33,19 @@ import io.ktor.server.websocket.WebSockets
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 import org.jsoup.select.Evaluator
+import org.modelix.model.api.IReferenceLink
+import org.modelix.model.api.ITree
+import org.modelix.model.api.NodeReferenceById
 import org.modelix.model.client.successful
+import org.modelix.model.client2.ModelClientV2
+import org.modelix.model.client2.runWrite
 import org.modelix.model.lazy.CLVersion
+import org.modelix.model.lazy.RepositoryId
 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.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation as ClientContentNegotiation
@@ -63,6 +70,12 @@ class ContentExplorerTest {
         }
     }
 
+    private suspend fun ApplicationTestBuilder.createModelClient(): ModelClientV2 {
+        val url = "http://localhost/v2"
+        val modelClient = ModelClientV2.builder().url(url).client(client).build().also { it.init() }
+        return modelClient
+    }
+
     @Test
     fun `node inspector finds root node`() = runTest {
         val client = createClient {
@@ -79,6 +92,34 @@ class ContentExplorerTest {
         assertTrue(response.successful)
     }
 
+    @Test
+    fun `node inspector can handle unresolvable references`() = runTest {
+        val modelClient = createModelClient()
+        val repoId = RepositoryId("node-inspector-null-ref")
+        val branchRef = repoId.getBranchReference("master")
+        val refLinkName = "myUnresolvableRef"
+        val refLinkTargetRef = NodeReferenceById("notAResolvableId")
+
+        modelClient.initRepository(repoId)
+
+        modelClient.runWrite(branchRef) { root ->
+            root.setReferenceTarget(IReferenceLink.fromName(refLinkName), refLinkTargetRef)
+        }
+
+        val versionHash = modelClient.pullHash(branchRef)
+
+        val response = client.get("/content/$versionHash/${ITree.ROOT_ID}/")
+        val html = Jsoup.parse(response.bodyAsText())
+        val nameCell = html.selectXpath("""//td[text()="$refLinkName"]""").first() ?: error("table cell not found")
+        val row = checkNotNull(nameCell.parent()) { "table row not found" }
+        val targetNodeIdCell = row.allElements[2] // index 0 is the row itself and 1 the nameCell
+        val targetRefCell = row.allElements[3]
+
+        assertTrue(response.successful)
+        assertEquals("null", targetNodeIdCell.text())
+        assertEquals(refLinkTargetRef.serialize(), targetRefCell.text())
+    }
+
     @Test
     fun `nodes can be expanded`() = runTest {
         val client = createClient {