src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt

Mon, 05 Aug 2024 19:17:36 +0200

author
Mike Becker <universe@uap-core.de>
date
Mon, 05 Aug 2024 19:17:36 +0200
changeset 312
b7554a6ef430
parent 311
bf67e0ff7131
child 314
8a8b1c5d168b
permissions
-rw-r--r--

add more filter options and cross-links

relates to issue #397

184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * Copyright 2021 Mike Becker. All rights reserved.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Redistribution and use in source and binary forms, with or without
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 * modification, are permitted provided that the following conditions are met:
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * 1. Redistributions of source code must retain the above copyright
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 * notice, this list of conditions and the following disclaimer.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * 2. Redistributions in binary form must reproduce the above copyright
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 * notice, this list of conditions and the following disclaimer in the
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * documentation and/or other materials provided with the distribution.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 */
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 package de.uapcore.lightpit.viewmodel
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 import com.vladsch.flexmark.ext.tables.TablesExtension
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30 import com.vladsch.flexmark.html.HtmlRenderer
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
31 import com.vladsch.flexmark.parser.Parser
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
39 import kotlin.math.roundToInt
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
43 DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED;
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
44
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
45 val resourceKey: String by lazy {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
46 if (this == DONE) "issue.filter.sort.done"
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
47 else if (this == PHASE) "issue.filter.sort.phase"
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
48 else "issue.${this.name.lowercase()}"
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
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
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
52 data class Criteria(val field: Field, val asc: Boolean = true) {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
53 override fun toString(): String {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
54 return "$field.$asc"
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
55 }
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
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
fb2ae2d63a56 some minor style fixes
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
80 class IssueSummary {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
81 var open = 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
82 var active = 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
83 var done = 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
84
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
85 val total get() = open + active + done
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
86
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
87 val openPercent get() = 100 - activePercent - donePercent
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
88 val activePercent get() = if (total > 0) (100f * active / total).roundToInt() else 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
89 val donePercent get() = if (total > 0) (100f * done / total).roundToInt() else 100
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
90
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
91 /**
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
92 * Adds the specified issue to the summary by incrementing the respective counter.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
93 * @param issue the issue
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
94 */
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
95 fun add(issue: Issue) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
96 when (issue.status.phase) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
97 IssueStatusPhase.Open -> open++
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
98 IssueStatusPhase.WorkInProgress -> active++
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
99 IssueStatusPhase.Done -> done++
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
100 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
101 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
102 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
118 class IssueDetailView(
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
119 val issue: Issue,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
136
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
137 init {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
141 renderer = HtmlRenderer.builder(
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
142 options
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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("(/)", "&#9989;")
d71bc6db42ef add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
170 .replace("(x)", "&#10060;")
d71bc6db42ef add three emoji sequences (experimental feature)
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
171 .replace("(!)", "&#9889;")
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
175 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
176
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
177 class IssueEditView(
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
178 val issue: Issue,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
179 val versions: List<Version>,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
180 val components: List<Component>,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
184 ) : EditView() {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
185
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
186 val versionsUpcoming: List<Version>
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
187 val versionsRecent: List<Version>
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
191
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
192 init {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
198 for (v in versions) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
199 if (v.status.isReleased) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
200 if (v.status != VersionStatus.Deprecated) recent.add(v)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
201 } else {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
202 upcoming.add(v)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
203 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
207 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
208 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
216 val flagIncludeDone = "f.0"
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
217 val flagMine = "f.1"
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
218 val flagBlocker = "f.2"
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
219
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
220 val includeDone: Boolean = evalFlag(http, flagIncludeDone)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
221 val onlyMine: Boolean = evalFlag(http, flagMine)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
226
271
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
227 val sortPrimary: IssueSorter.Criteria = evalSort(http, "primary", IssueSorter.Criteria(IssueSorter.Field.DONE))
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
228 val sortSecondary: IssueSorter.Criteria = evalSort(http, "secondary", IssueSorter.Criteria(IssueSorter.Field.ETA))
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
229 val sortTertiary: IssueSorter.Criteria = evalSort(http, "tertiary", IssueSorter.Criteria(IssueSorter.Field.UPDATED, false))
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
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
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
233 private fun evalSort(http: HttpRequest, prio: String, defaultValue: IssueSorter.Criteria): IssueSorter.Criteria {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
234 val param = http.param("sort_$prio")
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
235 if (param != null) {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
236 http.session.removeAttribute("sort_$prio")
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
237 val p = param.split(".")
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
238 if (p.size > 1) {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
239 try {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
240 http.session.setAttribute("sort_$prio", IssueSorter.Criteria(enumValueOf(p[0]), p[1].toBoolean()))
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
241 } catch (_:IllegalArgumentException) {
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
242 // ignore malfored values
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
243 }
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
244 }
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
245 }
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
246 return http.session.getAttribute("sort_$prio") as IssueSorter.Criteria? ?: defaultValue
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
247 }
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
248
268
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
249 private fun evalFlag(http: HttpRequest, name: String): Boolean {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
250 val param = http.paramArray("filter")
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
251 if (param.isNotEmpty()) {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
252 if (param.contains(name)) {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
253 http.session.setAttribute(name, true)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
254 } else {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
255 http.session.removeAttribute(name)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
256 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
257 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
258 return http.session.getAttribute(name) != null
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
259 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
266 val sattr = "f.${prefix}"
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
267 val param = http.paramArray("filter")
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
268 if (param.isNotEmpty()) {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
269 val list = param.filter { it.startsWith("${prefix}.") }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
284 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
285 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
286 if (list.isEmpty()) {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
287 http.session.removeAttribute(sattr)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
288 } else {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
289 http.session.setAttribute(sattr, list.joinToString(","))
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
290 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
291 }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
292
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
293 return http.session.getAttribute(sattr)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
294 ?.toString()
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
295 ?.split(",")
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
296 ?.map { enumValueOf(it) }
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
297 ?: emptyList()
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
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 }

mercurial