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.viewmodel | |
27 | ||
28 | import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension | |
29 | import com.vladsch.flexmark.ext.tables.TablesExtension | |
30 | import com.vladsch.flexmark.html.HtmlRenderer | |
31 | import com.vladsch.flexmark.parser.Parser | |
32 | import com.vladsch.flexmark.util.data.MutableDataSet | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
33 | import com.vladsch.flexmark.util.data.SharedDataKeys |
268 | 34 | import de.uapcore.lightpit.HttpRequest |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
35 | import de.uapcore.lightpit.dao.DataAccessObject |
184 | 36 | import de.uapcore.lightpit.entities.* |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
37 | import de.uapcore.lightpit.logic.compareEtaTo |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
38 | import de.uapcore.lightpit.types.* |
184 | 39 | import kotlin.math.roundToInt |
40 | ||
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
41 | class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> { |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
42 | enum class Field { |
271 | 43 | DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED; |
44 | ||
45 | val resourceKey: String by lazy { | |
46 | if (this == DONE) "issue.filter.sort.done" | |
47 | else if (this == PHASE) "issue.filter.sort.phase" | |
48 | else "issue.${this.name.lowercase()}" | |
49 | } | |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
50 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
51 | |
271 | 52 | data class Criteria(val field: Field, val asc: Boolean = true) { |
53 | override fun toString(): String { | |
54 | return "$field.$asc" | |
55 | } | |
56 | } | |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
57 | |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
58 | override fun compare(left: Issue, right: Issue): Int { |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
59 | if (left == right) { |
260 | 60 | return 0 |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
61 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
62 | for (c in criteria) { |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
63 | val result = when (c.field) { |
267
d8ec2d8ffa82
fix default sort criteria
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
64 | Field.PHASE -> left.status.phase.compareTo(right.status.phase) |
d8ec2d8ffa82
fix default sort criteria
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
65 | Field.DONE -> (left.status.phase == IssueStatusPhase.Done).compareTo(right.status.phase == IssueStatusPhase.Done) |
265
6a21bb926e02
add more possible sort criteria
Mike Becker <universe@uap-core.de>
parents:
263
diff
changeset
|
66 | Field.STATUS -> left.status.compareTo(right.status) |
6a21bb926e02
add more possible sort criteria
Mike Becker <universe@uap-core.de>
parents:
263
diff
changeset
|
67 | Field.CATEGORY -> left.category.compareTo(right.category) |
6a21bb926e02
add more possible sort criteria
Mike Becker <universe@uap-core.de>
parents:
263
diff
changeset
|
68 | Field.ETA -> left.compareEtaTo(right.eta) |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
69 | Field.UPDATED -> left.updated.compareTo(right.updated) |
265
6a21bb926e02
add more possible sort criteria
Mike Becker <universe@uap-core.de>
parents:
263
diff
changeset
|
70 | Field.CREATED -> left.created.compareTo(right.created) |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
71 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
72 | if (result != 0) { |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
73 | return if (c.asc) result else -result |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
74 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
75 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
76 | return 0 |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
77 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
78 | } |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
79 | |
184 | 80 | class IssueSummary { |
81 | var open = 0 | |
82 | var active = 0 | |
83 | var done = 0 | |
84 | ||
85 | val total get() = open + active + done | |
86 | ||
87 | val openPercent get() = 100 - activePercent - donePercent | |
88 | val activePercent get() = if (total > 0) (100f * active / total).roundToInt() else 0 | |
89 | val donePercent get() = if (total > 0) (100f * done / total).roundToInt() else 100 | |
90 | ||
91 | /** | |
92 | * Adds the specified issue to the summary by incrementing the respective counter. | |
93 | * @param issue the issue | |
94 | */ | |
95 | fun add(issue: Issue) { | |
96 | when (issue.status.phase) { | |
97 | IssueStatusPhase.Open -> open++ | |
98 | IssueStatusPhase.WorkInProgress -> active++ | |
99 | IssueStatusPhase.Done -> done++ | |
100 | } | |
101 | } | |
102 | } | |
103 | ||
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
104 | data class CommitLink(val url: String, val hash: String, val message: String) |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
105 | |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
106 | class IssueOverview( |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
107 | val issues: List<Issue>, |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
108 | val filter: IssueFilter |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
109 | ) : View() { |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
110 | val issueSummary = IssueSummary() |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
111 | |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
112 | init { |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
113 | feedHref = "feed/-/issues.rss" |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
114 | issues.forEach(issueSummary::add) |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
115 | } |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
116 | } |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
117 | |
184 | 118 | class IssueDetailView( |
119 | val issue: Issue, | |
120 | val comments: List<IssueComment>, | |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
121 | projectIssues: List<Issue>, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
122 | val currentRelations: List<IssueRelation>, |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
123 | commitRefs: List<CommitRef>, |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
124 | /** |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
125 | * Optional resource key to an error message for the relation editor. |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
126 | */ |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
127 | val relationError: String? = null, |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
128 | val pathInfos: PathInfos? = null |
184 | 129 | ) : View() { |
291
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
130 | val relationTypes = RelationType.entries |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
131 | val linkableIssues = projectIssues.filterNot { it.id == issue.id } |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
132 | val commitLinks: List<CommitLink> |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
260
diff
changeset
|
133 | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
134 | private val parser: Parser |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
135 | private val renderer: HtmlRenderer |
184 | 136 | |
137 | init { | |
138 | val options = MutableDataSet() | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
139 | .set(SharedDataKeys.EXTENSIONS, listOf(TablesExtension.create(), StrikethroughExtension.create())) |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
140 | parser = Parser.builder(options).build() |
268 | 141 | renderer = HtmlRenderer.builder( |
142 | options | |
143 | .set(HtmlRenderer.ESCAPE_HTML, true) | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
144 | ).build() |
184 | 145 | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
146 | issue.description = formatMarkdown(issue.description ?: "") |
184 | 147 | for (comment in comments) { |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
148 | comment.commentFormatted = formatMarkdown(comment.comment) |
184 | 149 | } |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
150 | |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
151 | val commitBaseUrl = issue.project.repoUrl |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
152 | commitLinks = (if (commitBaseUrl == null || issue.project.vcs == VcsType.None) emptyList() else commitRefs.map { |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
153 | CommitLink(buildCommitUrl(commitBaseUrl, issue.project.vcs, it.hash), it.hash, it.message) |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
154 | }) |
184 | 155 | } |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
156 | |
284
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
157 | private fun buildCommitUrl(baseUrl: String, vcs: VcsType, hash: String): String = |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
158 | with (StringBuilder(baseUrl)) { |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
159 | if (!endsWith("/")) append('/') |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
160 | when (vcs) { |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
161 | VcsType.Mercurial -> append("rev/") |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
162 | else -> append("commit/") |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
163 | } |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
164 | append(hash) |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
165 | toString() |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
166 | } |
671c1c8fbf1c
add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents:
271
diff
changeset
|
167 | |
234
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
168 | private fun formatEmojis(text: String) = text |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
169 | .replace("(/)", "✅") |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
170 | .replace("(x)", "❌") |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
171 | .replace("(!)", "⚡") |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
172 | |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
173 | private fun formatMarkdown(text: String) = |
d71bc6db42ef
add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
174 | renderer.render(parser.parse(formatEmojis(text))) |
184 | 175 | } |
176 | ||
177 | class IssueEditView( | |
178 | val issue: Issue, | |
179 | val versions: List<Version>, | |
180 | val components: List<Component>, | |
181 | val users: List<User>, | |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
182 | val project: Project, |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
183 | val pathInfos: PathInfos? = null |
184 | 184 | ) : EditView() { |
185 | ||
186 | val versionsUpcoming: List<Version> | |
187 | val versionsRecent: List<Version> | |
188 | ||
291
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
189 | val issueStatus = IssueStatus.entries |
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
190 | val issueCategory = IssueCategory.entries |
184 | 191 | |
192 | init { | |
193 | val recent = mutableListOf<Version>() | |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
207
diff
changeset
|
194 | issue.affected?.let { recent.add(it) } |
184 | 195 | val upcoming = mutableListOf<Version>() |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
207
diff
changeset
|
196 | issue.resolved?.let { upcoming.add(it) } |
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
207
diff
changeset
|
197 | |
184 | 198 | for (v in versions) { |
199 | if (v.status.isReleased) { | |
200 | if (v.status != VersionStatus.Deprecated) recent.add(v) | |
201 | } else { | |
202 | upcoming.add(v) | |
203 | } | |
204 | } | |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
205 | versionsRecent = recent.distinct() |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
206 | versionsUpcoming = upcoming.distinct() |
184 | 207 | } |
208 | } | |
209 | ||
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
210 | class IssueFilter(http: HttpRequest, dao: DataAccessObject) { |
268 | 211 | |
291
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
212 | val issueStatus = IssueStatus.entries |
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
213 | val issueCategory = IssueCategory.entries |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
214 | val users = dao.listUsers().sortedBy(User::shortDisplayname) |
291
bcf05cccac6f
replace Enum.values() with Enum.entries
Mike Becker <universe@uap-core.de>
parents:
284
diff
changeset
|
215 | val sortCriteria = IssueSorter.Field.entries.flatMap { listOf(IssueSorter.Criteria(it, true), IssueSorter.Criteria(it, false)) } |
268 | 216 | val flagIncludeDone = "f.0" |
217 | val flagMine = "f.1" | |
218 | val flagBlocker = "f.2" | |
219 | ||
220 | val includeDone: Boolean = evalFlag(http, flagIncludeDone) | |
221 | val onlyMine: Boolean = evalFlag(http, flagMine) | |
222 | val onlyBlocker: Boolean = evalFlag(http, flagBlocker) | |
312
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
223 | val status: List<IssueStatus> = evalEnum(http, "s") { issueStatusOf(IssueStatusPhase(it)) } |
268 | 224 | val category: List<IssueCategory> = evalEnum(http, "c") |
307
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
225 | val assignee: List<Int> = evalInts(http, "u") |
268 | 226 | |
271 | 227 | val sortPrimary: IssueSorter.Criteria = evalSort(http, "primary", IssueSorter.Criteria(IssueSorter.Field.DONE)) |
228 | val sortSecondary: IssueSorter.Criteria = evalSort(http, "secondary", IssueSorter.Criteria(IssueSorter.Field.ETA)) | |
229 | val sortTertiary: IssueSorter.Criteria = evalSort(http, "tertiary", IssueSorter.Criteria(IssueSorter.Field.UPDATED, false)) | |
230 | ||
307
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
231 | fun containsAssignee(user: User?): Boolean = assignee.contains(user?.id?:-1) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
232 | |
271 | 233 | private fun evalSort(http: HttpRequest, prio: String, defaultValue: IssueSorter.Criteria): IssueSorter.Criteria { |
234 | val param = http.param("sort_$prio") | |
235 | if (param != null) { | |
236 | http.session.removeAttribute("sort_$prio") | |
237 | val p = param.split(".") | |
238 | if (p.size > 1) { | |
239 | try { | |
240 | http.session.setAttribute("sort_$prio", IssueSorter.Criteria(enumValueOf(p[0]), p[1].toBoolean())) | |
241 | } catch (_:IllegalArgumentException) { | |
242 | // ignore malfored values | |
243 | } | |
244 | } | |
245 | } | |
246 | return http.session.getAttribute("sort_$prio") as IssueSorter.Criteria? ?: defaultValue | |
247 | } | |
248 | ||
268 | 249 | private fun evalFlag(http: HttpRequest, name: String): Boolean { |
250 | val param = http.paramArray("filter") | |
251 | if (param.isNotEmpty()) { | |
252 | if (param.contains(name)) { | |
253 | http.session.setAttribute(name, true) | |
254 | } else { | |
255 | http.session.removeAttribute(name) | |
256 | } | |
257 | } | |
258 | return http.session.getAttribute(name) != null | |
259 | } | |
260 | ||
312
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
261 | private inline fun <reified T : Enum<T>> evalEnum( |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
262 | http: HttpRequest, |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
263 | prefix: String, |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
264 | categorizer: ((Int) -> List<T>) = { emptyList() } |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
265 | ): List<T> { |
268 | 266 | val sattr = "f.${prefix}" |
267 | val param = http.paramArray("filter") | |
268 | if (param.isNotEmpty()) { | |
269 | val list = param.filter { it.startsWith("${prefix}.") } | |
270 | .map { it.substring(prefix.length + 1) } | |
312
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
271 | .flatMap { |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
272 | // try resolving as category |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
273 | val cat = it.toIntOrNull() |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
274 | if (cat != null) { |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
275 | categorizer(cat) |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
276 | } else { |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
277 | try { |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
278 | // quick and very dirty validation |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
279 | listOf(enumValueOf<T>(it)) |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
280 | } catch (_: IllegalArgumentException) { |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
281 | // simply skip bogus enums |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
282 | emptyList() |
b7554a6ef430
add more filter options and cross-links
Mike Becker <universe@uap-core.de>
parents:
311
diff
changeset
|
283 | } |
268 | 284 | } |
285 | } | |
286 | if (list.isEmpty()) { | |
287 | http.session.removeAttribute(sattr) | |
288 | } else { | |
289 | http.session.setAttribute(sattr, list.joinToString(",")) | |
290 | } | |
291 | } | |
292 | ||
293 | return http.session.getAttribute(sattr) | |
294 | ?.toString() | |
295 | ?.split(",") | |
296 | ?.map { enumValueOf(it) } | |
297 | ?: emptyList() | |
298 | } | |
307
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
299 | |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
300 | private fun evalInts(http: HttpRequest, prefix: String): List<Int> { |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
301 | val sattr = "f.${prefix}" |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
302 | val param = http.paramArray("filter") |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
303 | if (param.isNotEmpty()) { |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
304 | val list = param.filter { it.startsWith("${prefix}.") } |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
305 | .map { it.substring(prefix.length + 1) } |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
306 | .mapNotNull(String::toIntOrNull) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
307 | if (list.isEmpty()) { |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
308 | http.session.removeAttribute(sattr) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
309 | } else { |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
310 | http.session.setAttribute(sattr, list.joinToString(",")) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
311 | } |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
312 | } |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
313 | |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
314 | return http.session.getAttribute(sattr) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
315 | ?.toString() |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
316 | ?.split(",") |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
317 | ?.map(String::toInt) |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
318 | ?: emptyList() |
23fe9f174d2d
add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents:
292
diff
changeset
|
319 | } |
268 | 320 | } |
311
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
321 | |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
322 | fun issueFilterFunction( |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
323 | filter: IssueFilter, |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
324 | relationsMap: IssueRelationMap, |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
325 | currentUserName: String |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
326 | ): (issue: Issue) -> Boolean = |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
327 | { |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
328 | (!filter.onlyMine || (it.assignee?.username ?: "") == currentUserName) && |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
329 | (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_, type) -> type.blocking } ?: false)) && |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
330 | (filter.status.isEmpty() || filter.status.contains(it.status)) && |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
331 | (filter.category.isEmpty() || filter.category.contains(it.category)) && |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
332 | (filter.onlyMine || filter.assignee.isEmpty() || filter.assignee.contains(it.assignee?.id ?: -1)) |
bf67e0ff7131
add new global issues page - fixes #404
Mike Becker <universe@uap-core.de>
parents:
307
diff
changeset
|
333 | } |