forked from
tangled.org/core
Monorepo for Tangled
appview: issues: filter issues by label on click
Signed-off-by: nove-b <nove.b.web@gmail.com>
+33
-12
+12
-1
appview/issues/issues.go
+12
-1
appview/issues/issues.go
···
7
7
"fmt"
8
8
"log/slog"
9
9
"net/http"
10
+
"strings"
10
11
"time"
11
12
12
13
comatproto "github.com/bluesky-social/indigo/api/atproto"
···
1002
1003
l.Error("failed to fetch vouch relationships", "err", err)
1003
1004
}
1004
1005
}
1005
-
1006
+
baseFilterParts := make([]string, 0, len(query.Items()))
1007
+
for _, item := range query.Items() {
1008
+
if item.Kind == searchquery.KindTagValue {
1009
+
if item.Key == "label" || !searchquery.KnownTags[item.Key] {
1010
+
continue
1011
+
}
1012
+
}
1013
+
baseFilterParts = append(baseFilterParts, item.Raw)
1014
+
}
1015
+
baseFilterQuery := strings.Join(baseFilterParts, " ")
1006
1016
rp.pages.RepoIssues(w, pages.RepoIssuesParams{
1007
1017
LoggedInUser: rp.oauth.GetMultiAccountUser(r),
1008
1018
RepoInfo: repoInfo,
···
1011
1021
LabelDefs: defs,
1012
1022
FilterState: filterState,
1013
1023
FilterQuery: query.String(),
1024
+
BaseFilterQuery: baseFilterQuery,
1014
1025
Page: page,
1015
1026
VouchRelationships: vouchRelationships,
1016
1027
})
+2
appview/pages/pages.go
+2
appview/pages/pages.go
···
1172
1172
Page pagination.Page
1173
1173
FilterState string
1174
1174
FilterQuery string
1175
+
BaseFilterQuery string
1175
1176
VouchRelationships map[syntax.DID]*models.VouchRelationship
1176
1177
}
1177
1178
···
1335
1336
Active string
1336
1337
FilterState string
1337
1338
FilterQuery string
1339
+
BaseFilterQuery string
1338
1340
Stacks []models.Stack
1339
1341
Pipelines map[string]models.Pipeline
1340
1342
LabelDefs map[string]*models.LabelDefinition
+14
-8
appview/pages/templates/labels/fragments/label.html
+14
-8
appview/pages/templates/labels/fragments/label.html
···
2
2
{{ $d := .def }}
3
3
{{ $v := .val }}
4
4
{{ $withPrefix := .withPrefix }}
5
+
{{ $baseFilterQuery := .baseFilterQuery }}
6
+
{{ $basePath := .basePath }}
5
7
6
8
{{ $lhs := printf "%s" $d.Name }}
7
9
{{ $rhs := "" }}
8
-
{{ $isDid := false }}
9
-
{{ $resolvedVal := "" }}
10
10
11
11
{{ if not $d.ValueType.IsNull }}
12
-
{{ $isDid = $d.ValueType.IsDidFormat }}
13
-
{{ if $isDid }}
14
-
{{ $resolvedVal = resolve $v }}
15
-
{{ $v = $resolvedVal }}
12
+
{{ if $d.ValueType.IsDidFormat }}
13
+
{{ $v = resolve $v }}
16
14
{{ end }}
17
15
18
16
{{ if not $withPrefix }}
···
26
24
27
25
{{ $chipClasses := "w-fit flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm text-inherit" }}
28
26
29
-
{{ if $isDid }}
30
-
<a href="/{{ $resolvedVal }}" class="{{ $chipClasses }} no-underline hover:underline">
27
+
{{ if $basePath }}
28
+
{{ $filterToken := printf "label:%s" $d.Name }}
29
+
{{ if not $d.ValueType.IsNull }}
30
+
{{ $filterToken = printf "%s:%s" $d.Name $v }}
31
+
{{ end }}
32
+
{{ $fullQuery := $filterToken }}
33
+
{{ if ne $baseFilterQuery "" }}
34
+
{{ $fullQuery = printf "%s %s" $baseFilterQuery $filterToken }}
35
+
{{ end }}
36
+
<a href="{{ $basePath }}?q={{ urlquery $fullQuery }}" class="{{ $chipClasses }}">
31
37
{{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }}
32
38
{{ printf "%s%s" $lhs $rhs }}
33
39
</a>
+1
-1
appview/pages/templates/repo/issues/fragments/issueListing.html
+1
-1
appview/pages/templates/repo/issues/fragments/issueListing.html
···
46
46
{{ $state := .Labels }}
47
47
{{ range $k, $d := $.LabelDefs }}
48
48
{{ range $v, $s := $state.GetValSet $d.AtUri.String }}
49
-
{{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}
49
+
{{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true "baseFilterQuery" $.BaseFilterQuery "basePath" $.BasePath) }}
50
50
{{ end }}
51
51
{{ end }}
52
52
</div>
+3
-1
appview/pages/templates/repo/issues/issues.html
+3
-1
appview/pages/templates/repo/issues/issues.html
···
71
71
"RepoPrefix" .RepoInfo.FullName
72
72
"LabelDefs" .LabelDefs
73
73
"VouchRelationships" .VouchRelationships
74
-
) }}
74
+
"BaseFilterQuery" $.BaseFilterQuery
75
+
"BasePath" (printf "/%s/issues" .RepoInfo.FullName))
76
+
}}
75
77
</div>
76
78
{{if gt .IssueCount .Page.Limit }}
77
79
{{ template "fragments/pagination" (dict
+1
-1
appview/pages/templates/repo/pulls/pulls.html
+1
-1
appview/pages/templates/repo/pulls/pulls.html
···
111
111
{{ $state := $topPR.Labels }}
112
112
{{ range $k, $d := $.LabelDefs }}
113
113
{{ range $v, $s := $state.GetValSet $d.AtUri.String }}
114
-
{{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}
114
+
{{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true "baseFilterQuery" $.BaseFilterQuery "basePath" (printf "/%s/pulls" $.RepoInfo.FullName)) }}
115
115
{{ end }}
116
116
{{ end }}
117
117
</div>