Merge pull request #515 from modelix/feature/delete-repo-via-web-ui

feat(model-server): Minor web UI improvements

Author: nkoester

model-server-openapi/specifications/model-server-html.yaml

@@ -37,6 +37,23 @@ paths:
               examples:
                 Example#1:
                   value: "../repos/"
+  /content/{repository}/{branch}/latest:
+    get:
+      operationId: getContentRepositoryBranchLatest
+      parameters:
+        - name: repository
+          in: "path"
+          required: true
+          schema:
+            type: string
+        - name: branch
+          in: "path"
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          $ref: '#/components/responses/200'
   /content/{versionHash}:
     get:
       operationId: getVersionHash

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

@@ -43,7 +43,9 @@ import org.modelix.model.api.ITree
 import org.modelix.model.api.PNodeAdapter
 import org.modelix.model.api.TreePointer
 import org.modelix.model.client.IModelClient
+import org.modelix.model.lazy.BranchReference
 import org.modelix.model.lazy.CLVersion
+import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.server.templates.PageWithMenuBar
 import kotlin.collections.set
 
@@ -54,6 +56,26 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
             get<Paths.getContent> {
                 call.respondRedirect("../repos/")
             }
+            get<Paths.getContentRepositoryBranchLatest> {
+                val repository = call.parameters["repository"]
+                val branch = call.parameters["branch"]
+                if (repository.isNullOrEmpty()) {
+                    call.respondText("repository not found", status = HttpStatusCode.BadRequest)
+                    return@get
+                }
+                if (branch.isNullOrEmpty()) {
+                    call.respondText("branch not found", status = HttpStatusCode.BadRequest)
+                    return@get
+                }
+
+                val latestVersion = repoManager.getVersion(BranchReference(RepositoryId(repository), branch))
+                if (latestVersion == null) {
+                    call.respondText("unable to find latest version", status = HttpStatusCode.InternalServerError)
+                    return@get
+                } else {
+                    call.respondRedirect("../../../${latestVersion.getContentHash()}/")
+                }
+            }
             get<Paths.getVersionHash> {
                 val versionHash = call.parameters["versionHash"]
                 if (versionHash.isNullOrEmpty()) {

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

@@ -9,9 +9,11 @@ import io.ktor.server.routing.routing
 import kotlinx.html.FlowContent
 import kotlinx.html.FlowOrInteractiveOrPhrasingContent
 import kotlinx.html.a
+import kotlinx.html.form
 import kotlinx.html.h1
 import kotlinx.html.i
 import kotlinx.html.p
+import kotlinx.html.postButton
 import kotlinx.html.span
 import kotlinx.html.table
 import kotlinx.html.tbody
@@ -48,7 +50,7 @@ class RepositoryOverview(private val repoManager: RepositoriesManager) {
                         th { +"Repository" }
                         th { +"Branch" }
                         th {
-                            colSpan = "2"
+                            colSpan = "3"
                             +"Actions"
                         }
                     }
@@ -67,6 +69,7 @@ class RepositoryOverview(private val repoManager: RepositoriesManager) {
                                 td { }
                                 td { }
                                 td { }
+                                td { }
                             }
                         } else {
                             for (branch in branches) {
@@ -80,12 +83,19 @@ class RepositoryOverview(private val repoManager: RepositoriesManager) {
                                         buildHistoryLink(branch.repositoryId.id, branch.branchName)
                                     }
                                     td {
-                                        val latestVersion = repoManager.getVersion(branch)
-                                            ?: throw RuntimeException("Branch not found: $branch")
-                                        a("../content/${latestVersion.getContentHash()}/") {
+                                        a("../content/$repository/${branch.branchName}/latest/") {
                                             +"Explore Latest Version"
                                         }
                                     }
+                                    td {
+                                        form {
+                                            postButton {
+                                                name = "delete"
+                                                formAction = "../v2/repositories/${branch.repositoryId.id}/delete"
+                                                +"Delete Repository"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }