Skip to content

Commit c75dcf8

Browse files
committed
fix(model-server): render repository deletion button per repository instead of per branch
1 parent cc31abe commit c75dcf8

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ class RepositoryOverview(private val repoManager: IRepositoriesManager) {
4747
table {
4848
thead {
4949
tr {
50-
th { +"Repository" }
50+
th {
51+
colSpan = "2"
52+
+"Repository"
53+
}
5154
th { +"Branch" }
5255
th {
5356
colSpan = "3"
@@ -58,11 +61,16 @@ class RepositoryOverview(private val repoManager: IRepositoriesManager) {
5861
tbody {
5962
for (repository in repositories) {
6063
val branches = repoManager.getBranches(repository)
64+
val repoRowSpan = branches.size.coerceAtLeast(1).plus(1).toString()
6165
tr {
6266
td {
63-
rowSpan = branches.size.coerceAtLeast(1).plus(1).toString()
67+
rowSpan = repoRowSpan
6468
+repository.id
6569
}
70+
td {
71+
rowSpan = repoRowSpan
72+
buildDeleteRepositoryForm(repository.id)
73+
}
6674
}
6775
if (branches.isEmpty()) {
6876
tr {
@@ -85,9 +93,6 @@ class RepositoryOverview(private val repoManager: IRepositoriesManager) {
8593
td {
8694
buildExploreLatestLink(branch.repositoryId.id, branch.branchName)
8795
}
88-
td {
89-
buildDeleteForm(branch.repositoryId.id)
90-
}
9196
}
9297
}
9398
}
@@ -110,7 +115,7 @@ fun FlowOrInteractiveOrPhrasingContent.buildExploreLatestLink(repositoryId: Stri
110115
}
111116
}
112117

113-
fun FlowContent.buildDeleteForm(repositoryId: String) {
118+
fun FlowContent.buildDeleteRepositoryForm(repositoryId: String) {
114119
form {
115120
postButton {
116121
name = "delete"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class RepositoryOverviewTest {
2828
val html = createHTML(prettyPrint = false).span {
2929
buildHistoryLink("repository/v1", "branch/v2")
3030
buildExploreLatestLink("repository/v1", "branch/v2")
31-
buildDeleteForm("repository/v1")
31+
buildDeleteRepositoryForm("repository/v1")
3232
}
3333
assertEquals(
3434
"""

0 commit comments

Comments
 (0)