Mon, 05 Aug 2024 19:38:47 +0200
fix removing filter not working
fixes #407
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 | ||
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
28 | import de.uapcore.lightpit.* |
184 | 29 | import de.uapcore.lightpit.dao.DataAccessObject |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
30 | import de.uapcore.lightpit.entities.Component |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
31 | import de.uapcore.lightpit.entities.Issue |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
32 | import de.uapcore.lightpit.entities.Project |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
33 | import de.uapcore.lightpit.entities.Version |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
34 | import de.uapcore.lightpit.logic.* |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
35 | import de.uapcore.lightpit.types.VcsType |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
36 | import de.uapcore.lightpit.types.VersionStatus |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
37 | import de.uapcore.lightpit.types.WebColor |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
38 | import de.uapcore.lightpit.types.parseCommitRefs |
184 | 39 | 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
|
40 | import jakarta.servlet.annotation.WebServlet |
184 | 41 | import java.sql.Date |
42 | ||
43 | @WebServlet(urlPatterns = ["/projects/*"]) | |
44 | class ProjectServlet : AbstractServlet() { | |
45 | ||
46 | init { | |
47 | get("/", this::projects) | |
48 | get("/%project", this::project) | |
49 | get("/%project/issues/%version/%component/", this::project) | |
50 | get("/%project/edit", this::projectForm) | |
51 | get("/-/create", this::projectForm) | |
52 | post("/-/commit", this::projectCommit) | |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
53 | post("/%project/vcs/analyze", this::vcsAnalyze) |
184 | 54 | |
55 | get("/%project/versions/", this::versions) | |
56 | get("/%project/versions/%version/edit", this::versionForm) | |
57 | get("/%project/versions/-/create", this::versionForm) | |
58 | post("/%project/versions/-/commit", this::versionCommit) | |
59 | ||
60 | get("/%project/components/", this::components) | |
61 | get("/%project/components/%component/edit", this::componentForm) | |
62 | get("/%project/components/-/create", this::componentForm) | |
63 | post("/%project/components/-/commit", this::componentCommit) | |
64 | ||
65 | get("/%project/issues/%version/%component/%issue", this::issue) | |
66 | 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
|
67 | post("/%project/issues/%version/%component/%issue/comment", this::issueComment) |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
68 | post("/%project/issues/%version/%component/%issue/relation", this::issueRelation) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
69 | get("/%project/issues/%version/%component/%issue/removeRelation", this::issueRemoveRelation) |
184 | 70 | 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
|
71 | post("/%project/issues/%version/%component/-/commit", this::issueCommit) |
184 | 72 | } |
73 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
74 | private fun projects(http: HttpRequest, dao: DataAccessObject) { |
184 | 75 | val projects = dao.listProjects() |
76 | val projectInfos = projects.map { | |
77 | ProjectInfo( | |
78 | project = it, | |
79 | versions = dao.listVersions(it), | |
80 | components = emptyList(), // not required in this view | |
81 | issueSummary = dao.collectIssueSummary(it) | |
82 | ) | |
83 | } | |
84 | ||
85 | with(http) { | |
86 | view = ProjectsView(projectInfos) | |
87 | navigationMenu = projectNavMenu(projects) | |
88 | styleSheets = listOf("projects") | |
89 | render("projects") | |
90 | } | |
91 | } | |
92 | ||
93 | private fun sanitizeNode(name: String): String { | |
94 | val san = name.replace(Regex("[/\\\\]"), "-") | |
95 | return if (san.startsWith(".")) { | |
96 | "v$san" | |
97 | } else { | |
98 | san | |
99 | } | |
100 | } | |
101 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
102 | private fun project(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
103 | withPathInfo(http, dao)?.let {path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
104 | val project = path.projectInfo.project |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
105 | |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
106 | val filter = IssueFilter(http, dao) |
268 | 107 | |
108 | val needRelationsMap = filter.onlyBlocker | |
109 | ||
110 | val relationsMap = if (needRelationsMap) dao.getIssueRelationMap(project, filter.includeDone) else emptyMap() | |
111 | ||
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
112 | val specificVersion = path.versionInfo !is OptionalPathInfo.All |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
113 | val version = if (path.versionInfo is OptionalPathInfo.Specific) path.versionInfo.elem else null |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
114 | val specificComponent = path.componentInfo !is OptionalPathInfo.All |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
115 | val component = if (path.componentInfo is OptionalPathInfo.Specific) path.componentInfo.elem else null |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
116 | |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
117 | val issues = dao.listIssues(project, filter.includeDone, specificVersion, version, specificComponent, component) |
271 | 118 | .sortedWith(IssueSorter(filter.sortPrimary, filter.sortSecondary, filter.sortTertiary)) |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
119 | .filter(issueFilterFunction(filter, relationsMap, http.remoteUser ?: "<Anonymous>")) |
184 | 120 | |
121 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
122 | pageTitle = project.name |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
123 | view = ProjectDetails(path, issues, filter) |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
124 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
184 | 125 | styleSheets = listOf("projects") |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
126 | javascript = "issue-overview" |
184 | 127 | render("project-details") |
128 | } | |
129 | } | |
130 | } | |
131 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
132 | private fun projectForm(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
133 | http.styleSheets = listOf("projects") |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
134 | if (!http.pathParams.containsKey("project")) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
135 | http.view = ProjectEditView(Project(-1), dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
136 | http.navigationMenu = projectNavMenu(dao.listProjects()) |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
137 | http.render("project-form") |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
138 | } else { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
139 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
140 | http.view = ProjectEditView(path.projectInfo.project, dao.listUsers()) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
141 | http.navigationMenu = projectNavMenu(dao.listProjects(), path) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
142 | http.render("project-form") |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
143 | } |
184 | 144 | } |
145 | } | |
146 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
147 | private fun projectCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 148 | val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply { |
149 | name = http.param("name") ?: "" | |
150 | node = http.param("node") ?: "" | |
151 | description = http.param("description") ?: "" | |
152 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
153 | repoUrl = http.param("repoUrl") ?: "" | |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
154 | vcs = VcsType.valueOf(http.param("vcs") ?: "None") |
184 | 155 | owner = (http.param("owner")?.toIntOrNull() ?: -1).let { |
156 | if (it < 0) null else dao.findUser(it) | |
157 | } | |
158 | // intentional defaults | |
159 | if (node.isBlank()) node = name | |
160 | // sanitizing | |
161 | node = sanitizeNode(node) | |
162 | } | |
163 | ||
164 | if (project.id < 0) { | |
165 | dao.insertProject(project) | |
166 | } else { | |
167 | dao.updateProject(project) | |
168 | } | |
169 | ||
170 | http.renderCommit("projects/${project.node}") | |
171 | } | |
172 | ||
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
173 | private fun vcsAnalyze(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
174 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
175 | // if analysis is not configured, reject the request |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
176 | if (path.projectInfo.project.vcs == VcsType.None) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
177 | http.response.sendError(404) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
178 | return |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
179 | } |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
180 | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
181 | // obtain the list of issues for this project to filter cross-project references |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
182 | val knownIds = dao.listIssues(path.projectInfo.project, true).map { it.id } |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
183 | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
184 | // read the provided commit log and merge only the refs that relate issues from the current project |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
185 | dao.mergeCommitRefs(parseCommitRefs(http.body).filter { knownIds.contains(it.issueId) }) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
186 | } |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
187 | } |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
188 | |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
189 | private fun versions(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
190 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
191 | with(http) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
192 | pageTitle = "${path.projectInfo.project.name} - ${i18n("navmenu.versions")}" |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
193 | view = VersionsView( |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
194 | path.projectInfo, |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
195 | dao.listVersionSummaries(path.projectInfo.project) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
196 | ) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
197 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
198 | styleSheets = listOf("projects") |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
199 | javascript = "issue-overview" |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
200 | render("versions") |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
201 | } |
184 | 202 | } |
203 | } | |
204 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
205 | private fun versionForm(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
206 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
207 | val version = if (path.versionInfo is OptionalPathInfo.Specific) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
208 | path.versionInfo.elem else Version(-1, path.projectInfo.project.id) |
184 | 209 | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
210 | with(http) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
211 | view = VersionEditView(path.projectInfo, version) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
212 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
213 | styleSheets = listOf("projects") |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
214 | render("version-form") |
184 | 215 | } |
216 | } | |
217 | } | |
218 | ||
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
219 | private fun obtainIdAndProject(http: HttpRequest, dao: DataAccessObject): Pair<Int, Project>? { |
184 | 220 | val id = http.param("id")?.toIntOrNull() |
221 | val projectid = http.param("projectid")?.toIntOrNull() ?: -1 | |
222 | val project = dao.findProject(projectid) | |
210 | 223 | return if (id == null || project == null) { |
184 | 224 | http.response.sendError(400) |
210 | 225 | null |
226 | } else { | |
227 | Pair(id, project) | |
184 | 228 | } |
210 | 229 | } |
184 | 230 | |
210 | 231 | private fun versionCommit(http: HttpRequest, dao: DataAccessObject) { |
232 | val idParams = obtainIdAndProject(http, dao) ?: return | |
233 | val (id, project) = idParams | |
234 | ||
235 | val version = Version(id, project.id).apply { | |
184 | 236 | name = http.param("name") ?: "" |
237 | node = http.param("node") ?: "" | |
238 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
239 | 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
|
240 | // TODO: process error messages |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
241 | eol = http.param("eol", ::dateOptValidator, null, mutableListOf()) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
242 | release = http.param("release", ::dateOptValidator, null, mutableListOf()) |
184 | 243 | // intentional defaults |
244 | if (node.isBlank()) node = name | |
245 | // sanitizing | |
246 | node = sanitizeNode(node) | |
247 | } | |
248 | ||
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
249 | // sanitize eol and release date |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
250 | if (version.status.isEndOfLife) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
251 | 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
|
252 | } else if (version.status.isReleased) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
253 | 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
|
254 | } |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
255 | |
184 | 256 | if (id < 0) { |
257 | dao.insertVersion(version) | |
258 | } else { | |
259 | dao.updateVersion(version) | |
260 | } | |
261 | ||
262 | http.renderCommit("projects/${project.node}/versions/") | |
263 | } | |
264 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
265 | private fun components(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
266 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
267 | with(http) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
268 | pageTitle = "${path.projectInfo.project.name} - ${i18n("navmenu.components")}" |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
269 | view = ComponentsView( |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
270 | path.projectInfo, |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
271 | dao.listComponentSummaries(path.projectInfo.project) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
272 | ) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
273 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
274 | styleSheets = listOf("projects") |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
275 | javascript = "issue-overview" |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
276 | render("components") |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
277 | } |
184 | 278 | } |
279 | } | |
280 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
281 | private fun componentForm(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
282 | withPathInfo(http, dao)?.let { path -> |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
283 | val component = if (path.componentInfo is OptionalPathInfo.Specific) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
284 | path.componentInfo.elem else Component(-1, path.projectInfo.project.id) |
184 | 285 | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
286 | with(http) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
287 | view = ComponentEditView(path.projectInfo, component, dao.listUsers()) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
288 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
289 | styleSheets = listOf("projects") |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
290 | render("component-form") |
184 | 291 | } |
292 | } | |
293 | } | |
294 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
295 | private fun componentCommit(http: HttpRequest, dao: DataAccessObject) { |
210 | 296 | val idParams = obtainIdAndProject(http, dao) ?: return |
297 | val (id, project) = idParams | |
184 | 298 | |
210 | 299 | val component = Component(id, project.id).apply { |
184 | 300 | name = http.param("name") ?: "" |
301 | node = http.param("node") ?: "" | |
302 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
303 | color = WebColor(http.param("color") ?: "#000000") | |
304 | description = http.param("description") | |
227
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
305 | // TODO: process error message |
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
306 | active = http.param("active", ::boolValidator, true, mutableListOf()) |
184 | 307 | lead = (http.param("lead")?.toIntOrNull() ?: -1).let { |
308 | if (it < 0) null else dao.findUser(it) | |
309 | } | |
310 | // intentional defaults | |
311 | if (node.isBlank()) node = name | |
312 | // sanitizing | |
313 | node = sanitizeNode(node) | |
314 | } | |
315 | ||
316 | if (id < 0) { | |
317 | dao.insertComponent(component) | |
318 | } else { | |
319 | dao.updateComponent(component) | |
320 | } | |
321 | ||
322 | http.renderCommit("projects/${project.node}/components/") | |
323 | } | |
324 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
325 | private fun issue(http: HttpRequest, dao: DataAccessObject) { |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
326 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
327 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
328 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
329 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
330 | } |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
331 | withPathInfo(http, dao)?.let { path -> |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
332 | renderIssueView(http, dao, issue, path) |
184 | 333 | } |
334 | } | |
335 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
336 | private fun issueForm(http: HttpRequest, dao: DataAccessObject) { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
337 | withPathInfo(http, dao)?.let { path -> |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
338 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) ?: Issue( |
184 | 339 | -1, |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
340 | path.projectInfo.project, |
184 | 341 | ) |
342 | ||
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
343 | // for new issues set some defaults |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
344 | if (issue.id < 0) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
345 | // pre-select component, if available in the path info |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
346 | if (path.componentInfo is OptionalPathInfo.Specific) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
347 | issue.component = path.componentInfo.elem |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
348 | } |
184 | 349 | |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
350 | // pre-select version, if available in the path info |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
351 | if (path.versionInfo is OptionalPathInfo.Specific) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
352 | if (path.versionInfo.elem.status.isReleased) { |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
353 | issue.affected = path.versionInfo.elem |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
354 | } else { |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
355 | issue.resolved = path.versionInfo.elem |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
356 | } |
191
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
357 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
358 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
359 | |
184 | 360 | with(http) { |
361 | view = IssueEditView( | |
362 | issue, | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
363 | path.projectInfo.versions, |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
364 | path.projectInfo.components, |
184 | 365 | dao.listUsers(), |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
366 | path.projectInfo.project, |
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
367 | path |
184 | 368 | ) |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
369 | navigationMenu = projectNavMenu(dao.listProjects(), path) |
184 | 370 | styleSheets = listOf("projects") |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
371 | javascript = "issue-editor" |
184 | 372 | render("issue-form") |
373 | } | |
374 | } | |
375 | } | |
376 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
377 | private fun issueComment(http: HttpRequest, dao: DataAccessObject) { |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
378 | withPathInfo(http, dao)?.let {path -> |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
379 | commitIssueComment(http, dao, path) |
184 | 380 | } |
381 | } | |
382 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
383 | private fun issueCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 384 | withPathInfo(http, dao)?.run { |
385 | val issue = Issue( | |
386 | http.param("id")?.toIntOrNull() ?: -1, | |
292
703591e739f4
add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
387 | projectInfo.project |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
388 | ).applyFormData(http, dao) |
184 | 389 | |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
390 | 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
|
391 | 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
|
392 | dao.insertHistoryEvent(issue, id) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
393 | id |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
394 | } else { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
395 | 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
|
396 | if (reference == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
397 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
398 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
399 | } |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
400 | processIssueForm(issue, reference, http, dao) |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
401 | issue.id |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
402 | } |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
403 | |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
404 | if (http.param("more") != null) { |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
405 | http.renderCommit("${issuesHref}-/create") |
305
26e7f895f0f8
add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents:
304
diff
changeset
|
406 | } else if (http.param("save") != null) { |
26e7f895f0f8
add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents:
304
diff
changeset
|
407 | http.renderCommit("${issuesHref}${openId}") |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
408 | } else { |
305
26e7f895f0f8
add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents:
304
diff
changeset
|
409 | http.renderCommit(issuesHref) |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
410 | } |
184 | 411 | } |
412 | } | |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
413 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
414 | private fun issueRelation(http: HttpRequest, dao: DataAccessObject) { |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
415 | withPathInfo(http, dao)?.let {path -> |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
416 | addIssueRelation(http, dao, path) |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
417 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
418 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
419 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
420 | private fun issueRemoveRelation(http: HttpRequest, dao: DataAccessObject) { |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
421 | withPathInfo(http, dao)?.let {path -> |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
422 | removeIssueRelation(http, dao, path) |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
423 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
424 | } |
184 | 425 | } |