Thu, 29 Dec 2022 15:04:21 +0100
some minor style fixes
184 | 1 | /* |
2 | * Copyright 2021 Mike Becker. All rights reserved. | |
3 | * | |
4 | * Redistribution and use in source and binary forms, with or without | |
5 | * modification, are permitted provided that the following conditions are met: | |
6 | * | |
7 | * 1. Redistributions of source code must retain the above copyright | |
8 | * notice, this list of conditions and the following disclaimer. | |
9 | * | |
10 | * 2. Redistributions in binary form must reproduce the above copyright | |
11 | * notice, this list of conditions and the following disclaimer in the | |
12 | * documentation and/or other materials provided with the distribution. | |
13 | * | |
14 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
15 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
16 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
17 | * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | |
18 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
19 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
20 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |
21 | * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
22 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
23 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
24 | */ | |
25 | ||
26 | package de.uapcore.lightpit.servlet | |
27 | ||
247 | 28 | import de.uapcore.lightpit.AbstractServlet |
29 | import de.uapcore.lightpit.HttpRequest | |
30 | import de.uapcore.lightpit.boolValidator | |
184 | 31 | import de.uapcore.lightpit.dao.DataAccessObject |
247 | 32 | import de.uapcore.lightpit.dateOptValidator |
184 | 33 | import de.uapcore.lightpit.entities.* |
34 | import de.uapcore.lightpit.types.IssueCategory | |
35 | import de.uapcore.lightpit.types.IssueStatus | |
36 | import de.uapcore.lightpit.types.VersionStatus | |
37 | import de.uapcore.lightpit.types.WebColor | |
38 | import de.uapcore.lightpit.viewmodel.* | |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
39 | import jakarta.servlet.annotation.WebServlet |
184 | 40 | import java.sql.Date |
41 | ||
42 | @WebServlet(urlPatterns = ["/projects/*"]) | |
43 | class ProjectServlet : AbstractServlet() { | |
44 | ||
45 | init { | |
46 | get("/", this::projects) | |
47 | get("/%project", this::project) | |
48 | get("/%project/issues/%version/%component/", this::project) | |
49 | get("/%project/edit", this::projectForm) | |
50 | get("/-/create", this::projectForm) | |
51 | post("/-/commit", this::projectCommit) | |
52 | ||
53 | get("/%project/versions/", this::versions) | |
54 | get("/%project/versions/%version/edit", this::versionForm) | |
55 | get("/%project/versions/-/create", this::versionForm) | |
56 | post("/%project/versions/-/commit", this::versionCommit) | |
57 | ||
58 | get("/%project/components/", this::components) | |
59 | get("/%project/components/%component/edit", this::componentForm) | |
60 | get("/%project/components/-/create", this::componentForm) | |
61 | post("/%project/components/-/commit", this::componentCommit) | |
62 | ||
63 | get("/%project/issues/%version/%component/%issue", this::issue) | |
64 | get("/%project/issues/%version/%component/%issue/edit", this::issueForm) | |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
65 | post("/%project/issues/%version/%component/%issue/comment", this::issueComment) |
184 | 66 | get("/%project/issues/%version/%component/-/create", this::issueForm) |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
67 | post("/%project/issues/%version/%component/-/commit", this::issueCommit) |
184 | 68 | } |
69 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
70 | private fun projects(http: HttpRequest, dao: DataAccessObject) { |
184 | 71 | val projects = dao.listProjects() |
72 | val projectInfos = projects.map { | |
73 | ProjectInfo( | |
74 | project = it, | |
75 | versions = dao.listVersions(it), | |
76 | components = emptyList(), // not required in this view | |
77 | issueSummary = dao.collectIssueSummary(it) | |
78 | ) | |
79 | } | |
80 | ||
81 | with(http) { | |
82 | view = ProjectsView(projectInfos) | |
83 | navigationMenu = projectNavMenu(projects) | |
84 | styleSheets = listOf("projects") | |
85 | render("projects") | |
86 | } | |
87 | } | |
88 | ||
89 | private fun activeProjectNavMenu( | |
90 | projects: List<Project>, | |
91 | projectInfo: ProjectInfo, | |
92 | selectedVersion: Version? = null, | |
93 | selectedComponent: Component? = null | |
94 | ) = | |
95 | projectNavMenu( | |
96 | projects, | |
97 | projectInfo.versions, | |
98 | projectInfo.components, | |
99 | projectInfo.project, | |
100 | selectedVersion, | |
101 | selectedComponent | |
102 | ) | |
103 | ||
210 | 104 | private sealed interface LookupResult<T> |
105 | private class NotFound<T> : LookupResult<T> | |
106 | private data class Found<T>(val elem: T?) : LookupResult<T> | |
184 | 107 | |
108 | private fun <T : HasNode> HttpRequest.lookupPathParam(paramName: String, list: List<T>): LookupResult<T> { | |
109 | val node = pathParams[paramName] | |
110 | return if (node == null || node == "-") { | |
210 | 111 | Found(null) |
184 | 112 | } else { |
113 | val result = list.find { it.node == node } | |
114 | if (result == null) { | |
210 | 115 | NotFound() |
184 | 116 | } else { |
210 | 117 | Found(result) |
184 | 118 | } |
119 | } | |
120 | } | |
121 | ||
122 | private fun obtainProjectInfo(http: HttpRequest, dao: DataAccessObject): ProjectInfo? { | |
123 | val project = dao.findProjectByNode(http.pathParams["project"] ?: "") ?: return null | |
124 | ||
125 | val versions: List<Version> = dao.listVersions(project) | |
126 | val components: List<Component> = dao.listComponents(project) | |
127 | ||
128 | return ProjectInfo( | |
129 | project, | |
130 | versions, | |
131 | components, | |
132 | dao.collectIssueSummary(project) | |
133 | ) | |
134 | } | |
135 | ||
136 | private fun sanitizeNode(name: String): String { | |
137 | val san = name.replace(Regex("[/\\\\]"), "-") | |
138 | return if (san.startsWith(".")) { | |
139 | "v$san" | |
140 | } else { | |
141 | san | |
142 | } | |
143 | } | |
144 | ||
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
145 | private fun feedPath(project: Project) = "feed/${project.node}/issues.rss" |
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
146 | |
210 | 147 | private data class PathInfos( |
184 | 148 | val projectInfo: ProjectInfo, |
149 | val version: Version?, | |
150 | val component: Component? | |
151 | ) { | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
152 | val project = projectInfo.project |
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
153 | val issuesHref by lazyOf("projects/${project.node}/issues/${version?.node ?: "-"}/${component?.node ?: "-"}/") |
184 | 154 | } |
155 | ||
156 | private fun withPathInfo(http: HttpRequest, dao: DataAccessObject): PathInfos? { | |
157 | val projectInfo = obtainProjectInfo(http, dao) | |
158 | if (projectInfo == null) { | |
159 | http.response.sendError(404) | |
160 | return null | |
161 | } | |
162 | ||
163 | val version = when (val result = http.lookupPathParam("version", projectInfo.versions)) { | |
210 | 164 | is NotFound -> { |
184 | 165 | http.response.sendError(404) |
166 | return null | |
167 | } | |
210 | 168 | is Found -> { |
184 | 169 | result.elem |
170 | } | |
171 | } | |
172 | val component = when (val result = http.lookupPathParam("component", projectInfo.components)) { | |
210 | 173 | is NotFound -> { |
184 | 174 | http.response.sendError(404) |
175 | return null | |
176 | } | |
210 | 177 | is Found -> { |
184 | 178 | result.elem |
179 | } | |
180 | } | |
181 | ||
182 | return PathInfos(projectInfo, version, component) | |
183 | } | |
184 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
185 | private fun project(http: HttpRequest, dao: DataAccessObject) { |
184 | 186 | withPathInfo(http, dao)?.run { |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
187 | |
248
90dc13c78b5d
simplify listIssues() interface
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
188 | val issues = dao.listIssues(project, version, component) |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
189 | .sortedWith( |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
190 | IssueSorter( |
250
ce6d539bb970
replace sorting by DONE with sorting by PHASE
Mike Becker <universe@uap-core.de>
parents:
249
diff
changeset
|
191 | IssueSorter.Criteria(IssueSorter.Field.PHASE), |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
192 | IssueSorter.Criteria(IssueSorter.Field.ETA), |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
193 | IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
194 | ) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
195 | ) |
184 | 196 | |
197 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
198 | pageTitle = project.name |
184 | 199 | view = ProjectDetails(projectInfo, issues, version, component) |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
200 | feedPath = feedPath(project) |
184 | 201 | navigationMenu = activeProjectNavMenu( |
202 | dao.listProjects(), | |
203 | projectInfo, | |
204 | version, | |
205 | component | |
206 | ) | |
207 | styleSheets = listOf("projects") | |
208 | render("project-details") | |
209 | } | |
210 | } | |
211 | } | |
212 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
213 | private fun projectForm(http: HttpRequest, dao: DataAccessObject) { |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
214 | if (!http.pathParams.containsKey("project")) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
215 | http.view = ProjectEditView(Project(-1), dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
216 | http.navigationMenu = projectNavMenu(dao.listProjects()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
217 | } else { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
218 | val projectInfo = obtainProjectInfo(http, dao) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
219 | if (projectInfo == null) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
220 | http.response.sendError(404) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
221 | return |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
222 | } |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
223 | http.view = ProjectEditView(projectInfo.project, dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
224 | http.navigationMenu = activeProjectNavMenu( |
184 | 225 | dao.listProjects(), |
226 | projectInfo | |
227 | ) | |
228 | } | |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
229 | http.styleSheets = listOf("projects") |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
230 | http.render("project-form") |
184 | 231 | } |
232 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
233 | private fun projectCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 234 | val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply { |
235 | name = http.param("name") ?: "" | |
236 | node = http.param("node") ?: "" | |
237 | description = http.param("description") ?: "" | |
238 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
239 | repoUrl = http.param("repoUrl") ?: "" | |
240 | owner = (http.param("owner")?.toIntOrNull() ?: -1).let { | |
241 | if (it < 0) null else dao.findUser(it) | |
242 | } | |
243 | // intentional defaults | |
244 | if (node.isBlank()) node = name | |
245 | // sanitizing | |
246 | node = sanitizeNode(node) | |
247 | } | |
248 | ||
249 | if (project.id < 0) { | |
250 | dao.insertProject(project) | |
251 | } else { | |
252 | dao.updateProject(project) | |
253 | } | |
254 | ||
255 | http.renderCommit("projects/${project.node}") | |
256 | } | |
257 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
258 | private fun versions(http: HttpRequest, dao: DataAccessObject) { |
184 | 259 | val projectInfo = obtainProjectInfo(http, dao) |
260 | if (projectInfo == null) { | |
261 | http.response.sendError(404) | |
262 | return | |
263 | } | |
264 | ||
265 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
266 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.versions")}" |
184 | 267 | view = VersionsView( |
268 | projectInfo, | |
269 | dao.listVersionSummaries(projectInfo.project) | |
270 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
271 | feedPath = feedPath(projectInfo.project) |
184 | 272 | navigationMenu = activeProjectNavMenu( |
273 | dao.listProjects(), | |
274 | projectInfo | |
275 | ) | |
276 | styleSheets = listOf("projects") | |
277 | render("versions") | |
278 | } | |
279 | } | |
280 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
281 | private fun versionForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 282 | val projectInfo = obtainProjectInfo(http, dao) |
283 | if (projectInfo == null) { | |
284 | http.response.sendError(404) | |
285 | return | |
286 | } | |
287 | ||
288 | val version: Version | |
289 | when (val result = http.lookupPathParam("version", projectInfo.versions)) { | |
210 | 290 | is NotFound -> { |
184 | 291 | http.response.sendError(404) |
292 | return | |
293 | } | |
210 | 294 | is Found -> { |
184 | 295 | version = result.elem ?: Version(-1, projectInfo.project.id) |
296 | } | |
297 | } | |
298 | ||
299 | with(http) { | |
300 | view = VersionEditView(projectInfo, version) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
301 | feedPath = feedPath(projectInfo.project) |
184 | 302 | navigationMenu = activeProjectNavMenu( |
303 | dao.listProjects(), | |
304 | projectInfo, | |
305 | selectedVersion = version | |
306 | ) | |
307 | styleSheets = listOf("projects") | |
308 | render("version-form") | |
309 | } | |
310 | } | |
311 | ||
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
312 | private fun obtainIdAndProject(http: HttpRequest, dao: DataAccessObject): Pair<Int, Project>? { |
184 | 313 | val id = http.param("id")?.toIntOrNull() |
314 | val projectid = http.param("projectid")?.toIntOrNull() ?: -1 | |
315 | val project = dao.findProject(projectid) | |
210 | 316 | return if (id == null || project == null) { |
184 | 317 | http.response.sendError(400) |
210 | 318 | null |
319 | } else { | |
320 | Pair(id, project) | |
184 | 321 | } |
210 | 322 | } |
184 | 323 | |
210 | 324 | private fun versionCommit(http: HttpRequest, dao: DataAccessObject) { |
325 | val idParams = obtainIdAndProject(http, dao) ?: return | |
326 | val (id, project) = idParams | |
327 | ||
328 | val version = Version(id, project.id).apply { | |
184 | 329 | name = http.param("name") ?: "" |
330 | node = http.param("node") ?: "" | |
331 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
332 | status = http.param("status")?.let(VersionStatus::valueOf) ?: VersionStatus.Future | |
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
333 | // TODO: process error messages |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
334 | eol = http.param("eol", ::dateOptValidator, null, mutableListOf()) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
335 | release = http.param("release", ::dateOptValidator, null, mutableListOf()) |
184 | 336 | // intentional defaults |
337 | if (node.isBlank()) node = name | |
338 | // sanitizing | |
339 | node = sanitizeNode(node) | |
340 | } | |
341 | ||
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
342 | // sanitize eol and release date |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
343 | if (version.status.isEndOfLife) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
344 | if (version.eol == null) version.eol = Date(System.currentTimeMillis()) |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
345 | } else if (version.status.isReleased) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
346 | if (version.release == null) version.release = Date(System.currentTimeMillis()) |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
347 | } |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
348 | |
184 | 349 | if (id < 0) { |
350 | dao.insertVersion(version) | |
351 | } else { | |
352 | dao.updateVersion(version) | |
353 | } | |
354 | ||
355 | http.renderCommit("projects/${project.node}/versions/") | |
356 | } | |
357 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
358 | private fun components(http: HttpRequest, dao: DataAccessObject) { |
184 | 359 | val projectInfo = obtainProjectInfo(http, dao) |
360 | if (projectInfo == null) { | |
361 | http.response.sendError(404) | |
362 | return | |
363 | } | |
364 | ||
365 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
366 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.components")}" |
184 | 367 | view = ComponentsView( |
368 | projectInfo, | |
369 | dao.listComponentSummaries(projectInfo.project) | |
370 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
371 | feedPath = feedPath(projectInfo.project) |
184 | 372 | navigationMenu = activeProjectNavMenu( |
373 | dao.listProjects(), | |
374 | projectInfo | |
375 | ) | |
376 | styleSheets = listOf("projects") | |
377 | render("components") | |
378 | } | |
379 | } | |
380 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
381 | private fun componentForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 382 | val projectInfo = obtainProjectInfo(http, dao) |
383 | if (projectInfo == null) { | |
384 | http.response.sendError(404) | |
385 | return | |
386 | } | |
387 | ||
388 | val component: Component | |
389 | when (val result = http.lookupPathParam("component", projectInfo.components)) { | |
210 | 390 | is NotFound -> { |
184 | 391 | http.response.sendError(404) |
392 | return | |
393 | } | |
210 | 394 | is Found -> { |
184 | 395 | component = result.elem ?: Component(-1, projectInfo.project.id) |
396 | } | |
397 | } | |
398 | ||
399 | with(http) { | |
400 | view = ComponentEditView(projectInfo, component, dao.listUsers()) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
401 | feedPath = feedPath(projectInfo.project) |
184 | 402 | navigationMenu = activeProjectNavMenu( |
403 | dao.listProjects(), | |
404 | projectInfo, | |
405 | selectedComponent = component | |
406 | ) | |
407 | styleSheets = listOf("projects") | |
408 | render("component-form") | |
409 | } | |
410 | } | |
411 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
412 | private fun componentCommit(http: HttpRequest, dao: DataAccessObject) { |
210 | 413 | val idParams = obtainIdAndProject(http, dao) ?: return |
414 | val (id, project) = idParams | |
184 | 415 | |
210 | 416 | val component = Component(id, project.id).apply { |
184 | 417 | name = http.param("name") ?: "" |
418 | node = http.param("node") ?: "" | |
419 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
420 | color = WebColor(http.param("color") ?: "#000000") | |
421 | description = http.param("description") | |
227
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
422 | // TODO: process error message |
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
423 | active = http.param("active", ::boolValidator, true, mutableListOf()) |
184 | 424 | lead = (http.param("lead")?.toIntOrNull() ?: -1).let { |
425 | if (it < 0) null else dao.findUser(it) | |
426 | } | |
427 | // intentional defaults | |
428 | if (node.isBlank()) node = name | |
429 | // sanitizing | |
430 | node = sanitizeNode(node) | |
431 | } | |
432 | ||
433 | if (id < 0) { | |
434 | dao.insertComponent(component) | |
435 | } else { | |
436 | dao.updateComponent(component) | |
437 | } | |
438 | ||
439 | http.renderCommit("projects/${project.node}/components/") | |
440 | } | |
441 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
442 | private fun issue(http: HttpRequest, dao: DataAccessObject) { |
184 | 443 | withPathInfo(http, dao)?.run { |
444 | val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1) | |
445 | if (issue == null) { | |
446 | http.response.sendError(404) | |
447 | return | |
448 | } | |
449 | ||
450 | val comments = dao.listComments(issue) | |
451 | ||
452 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
453 | pageTitle = "${projectInfo.project.name}: #${issue.id} ${issue.subject}" |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
454 | view = IssueDetailView(issue, comments, project, version, component) |
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
455 | feedPath = feedPath(projectInfo.project) |
184 | 456 | navigationMenu = activeProjectNavMenu( |
457 | dao.listProjects(), | |
458 | projectInfo, | |
459 | version, | |
460 | component | |
461 | ) | |
462 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
463 | javascript = "issue-editor" |
184 | 464 | render("issue-view") |
465 | } | |
466 | } | |
467 | } | |
468 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
469 | private fun issueForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 470 | withPathInfo(http, dao)?.run { |
471 | val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1) ?: Issue( | |
472 | -1, | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
473 | project, |
184 | 474 | ) |
475 | ||
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
476 | // for new issues set some defaults |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
477 | if (issue.id < 0) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
478 | // pre-select component, if available in the path info |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
479 | issue.component = component |
184 | 480 | |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
481 | // pre-select version, if available in the path info |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
482 | if (version != null) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
483 | if (version.status.isReleased) { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
484 | issue.affected = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
485 | } else { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
486 | issue.resolved = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
487 | } |
191
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
488 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
489 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
490 | |
184 | 491 | with(http) { |
492 | view = IssueEditView( | |
493 | issue, | |
494 | projectInfo.versions, | |
495 | projectInfo.components, | |
496 | dao.listUsers(), | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
497 | project, |
184 | 498 | version, |
499 | component | |
500 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
501 | feedPath = feedPath(projectInfo.project) |
184 | 502 | navigationMenu = activeProjectNavMenu( |
503 | dao.listProjects(), | |
504 | projectInfo, | |
505 | version, | |
506 | component | |
507 | ) | |
508 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
509 | javascript = "issue-editor" |
184 | 510 | render("issue-form") |
511 | } | |
512 | } | |
513 | } | |
514 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
515 | private fun issueComment(http: HttpRequest, dao: DataAccessObject) { |
184 | 516 | withPathInfo(http, dao)?.run { |
517 | val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1) | |
518 | if (issue == null) { | |
519 | http.response.sendError(404) | |
520 | return | |
521 | } | |
522 | ||
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
523 | val commentId = http.param("commentid")?.toIntOrNull() ?: -1 |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
524 | if (commentId > 0) { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
525 | val comment = dao.findComment(commentId) |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
526 | if (comment == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
527 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
528 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
529 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
530 | val originalAuthor = comment.author?.username |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
531 | if (originalAuthor != null && originalAuthor == http.remoteUser) { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
532 | val newComment = http.param("comment") |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
533 | if (!newComment.isNullOrBlank()) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
534 | comment.comment = newComment |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
535 | dao.updateComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
536 | dao.insertHistoryEvent(issue, comment) |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
537 | } else { |
247 | 538 | logger.debug("Not updating comment ${comment.id} because nothing changed.") |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
539 | } |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
540 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
541 | http.response.sendError(403) |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
542 | return |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
543 | } |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
544 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
545 | val comment = IssueComment(-1, issue.id).apply { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
546 | author = http.remoteUser?.let { dao.findUserByName(it) } |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
547 | comment = http.param("comment") ?: "" |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
548 | } |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
549 | val newId = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
550 | dao.insertHistoryEvent(issue, comment, newId) |
184 | 551 | } |
552 | ||
553 | http.renderCommit("${issuesHref}${issue.id}") | |
554 | } | |
555 | } | |
556 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
557 | private fun issueCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 558 | withPathInfo(http, dao)?.run { |
559 | val issue = Issue( | |
560 | http.param("id")?.toIntOrNull() ?: -1, | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
561 | project |
184 | 562 | ).apply { |
563 | component = dao.findComponent(http.param("component")?.toIntOrNull() ?: -1) | |
564 | category = IssueCategory.valueOf(http.param("category") ?: "") | |
565 | status = IssueStatus.valueOf(http.param("status") ?: "") | |
566 | subject = http.param("subject") ?: "" | |
567 | description = http.param("description") ?: "" | |
568 | assignee = http.param("assignee")?.toIntOrNull()?.let { | |
569 | when (it) { | |
570 | -1 -> null | |
571 | -2 -> component?.lead | |
572 | else -> dao.findUser(it) | |
573 | } | |
574 | } | |
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
575 | // TODO: process error messages |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
576 | eta = http.param("eta", ::dateOptValidator, null, mutableListOf()) |
184 | 577 | |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
578 | affected = http.param("affected")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) } |
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
579 | resolved = http.param("resolved")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) } |
184 | 580 | } |
581 | ||
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
582 | val openId = if (issue.id < 0) { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
583 | val id = dao.insertIssue(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
584 | dao.insertHistoryEvent(issue, id) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
585 | id |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
586 | } else { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
587 | val reference = dao.findIssue(issue.id) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
588 | if (reference == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
589 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
590 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
591 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
592 | |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
593 | if (issue.hasChanged(reference)) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
594 | dao.updateIssue(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
595 | dao.insertHistoryEvent(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
596 | } else { |
247 | 597 | logger.debug("Not updating issue ${issue.id} because nothing changed.") |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
598 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
599 | |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
600 | val newComment = http.param("comment") |
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
601 | if (!newComment.isNullOrBlank()) { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
602 | val comment = IssueComment(-1, issue.id).apply { |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
603 | author = http.remoteUser?.let { dao.findUserByName(it) } |
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
604 | comment = newComment |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
605 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
606 | val commentid = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
607 | dao.insertHistoryEvent(issue, comment, commentid) |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
608 | } |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
609 | issue.id |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
610 | } |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
611 | |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
612 | if (http.param("more") != null) { |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
613 | http.renderCommit("${issuesHref}-/create") |
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
614 | } else { |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
615 | http.renderCommit("${issuesHref}${openId}") |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
616 | } |
184 | 617 | } |
618 | } | |
619 | } |